From nobody Tue Jun 24 09:55:31 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRL0z6VmLz5yZJy for ; Tue, 24 Jun 2025 09:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRL0z5KPsz3ndr; Tue, 24 Jun 2025 09:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758931; 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=mK+IO5+WlwSq5E8raBbHGtlfgoQjy81MgWwNcSn8hdQ=; b=M3aDY3oC4URWRrR92eczEolRZhMwmfvcxW96+AUHikd2eYeGmnV8r0lrDWWxdjc3zBD2VC IZm8PJXJfStkEHc/q6DhtCgr2ggDKp7D5uKE2eQa/FkQezlwkk/QX+wYVmBZNtTJ3j6Csy A5Gomj8zOvtUbd1Jv4VO7isoO7nPKzUPxRSF4z+h1o8izHLpDZaYC1AFlzAetBTtZ0IfrE Wd38S3qRbm0HlE1ZOUTX9uH9Gyy3DEeEFRvBDWQtb/6VsavhSsvnPxAD1Nj5NT/evcgEMI aHNB06sm4rfOBbJjAwSApbXEafSDGvdTldHd39iE8F9un/vkIIijElHGy5Ul8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758931; 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=mK+IO5+WlwSq5E8raBbHGtlfgoQjy81MgWwNcSn8hdQ=; b=PrRR7zv0KVnscUVGAhvzaosO/M0ZcB37jB3aAtHWWgkH3dk0tS0N99gY6DZvwoy8xUXOw8 z6TpZXYbmMJdHdxLeph1P/NATsuMK8lMvJjgvQM7xbmdrlhtvZTKY4x8VxchHgTP437si2 vRlsrdKppRHZgrbT0IHV97ukj39xpps0fq//FN6jYX5e6qRPu5s9fClhl05E7nYVPVctJj XRlVRSxqD5497Zy1DJ/o7xfXknVw0KJmMhzCDFa3tBPlCcpl4gRw2v6aLRSm5XM2GEX5eQ ncNZEBFDTmJFrs4XYnBlgcBSOOoW6RYZ5auSo8odOWWn76tdJX/KFxUCswNmHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750758931; a=rsa-sha256; cv=none; b=ZUC2HEnXQEeTXGJd8KtcXWrPlMJX7UF4UElXNK+tJr73r9nISErmkdNIoztA11xaC2/ihe ifWqPqZgGU8IrZOcL1J+XPh5A5h+be2uOsveOVbrzox8D1leZpL1NiG8JfRlHZNR985gXu KmwdIpR0bshK6j0Cf4t/+yMnDF5vlpNQ4vKBjJ5Rhc8PeTHHAK9uifqA8XZ8zwfeqxEzLI ZoLfaLmOH5uGiHfKhfCCyGTywpP3swrJg2llJNHSp02FwWGz66AKp5RrUgz/TRryxlmZOf ypF3MZzyGA4p+WLAC1/D2p88LuFFTknaLoU9SJZDzSWGOtFikuySJZiHpckqMA== 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 4bRL0z4M1NzjZM; Tue, 24 Jun 2025 09:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55O9tVGa026818; Tue, 24 Jun 2025 09:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55O9tVq3026815; Tue, 24 Jun 2025 09:55:31 GMT (envelope-from git) Date: Tue, 24 Jun 2025 09:55:31 GMT Message-Id: <202506240955.55O9tVq3026815@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: f8a111726e - main - Status/2025Q2/ports-security.adoc: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8a111726e5667aae84aaf7341815e81f78f8db5 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=f8a111726e5667aae84aaf7341815e81f78f8db5 commit f8a111726e5667aae84aaf7341815e81f78f8db5 Author: Alexander Leidinger AuthorDate: 2025-06-24 09:25:06 +0000 Commit: Lorenzo Salvadore CommitDate: 2025-06-24 09:51:47 +0000 Status/2025Q2/ports-security.adoc: Add report Reviewed by: status (Pau Amma ) --- .../report-2025-04-2025-06/ports-security.adoc | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/website/content/en/status/report-2025-04-2025-06/ports-security.adoc b/website/content/en/status/report-2025-04-2025-06/ports-security.adoc new file mode 100644 index 0000000000..d4b4211b77 --- /dev/null +++ b/website/content/en/status/report-2025-04-2025-06/ports-security.adoc @@ -0,0 +1,24 @@ +=== Security Hardening Compiler Options for the Ports Collection + +Links: + +link:https://cgit.freebsd.org/ports/commit/Mk/Features/fortify.mk?id=7a489e95c51f47f5e25a5613e375ec000618e52a[Commit of the features] URL: link:https://cgit.freebsd.org/ports/commit/Mk/Features/fortify.mk?id=7a489e95c51f47f5e25a5613e375ec000618e52a[] + +link:https://www.leidinger.net/blog/2025/05/24/freebsd-security-hardening-with-compiler-options/[FreeBSD security hardening with compiler options] URL: link:https://www.leidinger.net/blog/2025/05/24/freebsd-security-hardening-with-compiler-options/[] + +Contact: Alexander Leidinger + +The Ports Collection gained the possibility to enable some security features of modern compilers for package builds. +As not all ports are compatible with them, this is not enabled by default. + +The 3 new features which can be enabled for the Ports Collection in [.filename]#make.conf# are: + +- WITH_FORTIFY=yes:: +This enables mitigations of common memory safety issues, such as buffer overflows, by adding checks to functions like memcpy, strcpy, sprintf, and others when the compiler can determine the size of the destination buffer at compile time. +This requires support from the FreeBSD base system and may only be available in FreeBSD 15 onwards. +WITH_STACK_AUTOINIT=yes:: +This enables a compiler specific option to automatically initialize local (automatic) variables to prevent the use of uninitialized memory. +WITH_ZEROREGS=yes:: +Zero call-used registers at function return to increase program security by either mitigating Return-Oriented Programming (ROP) attacks or preventing information leakage through registers. +This depends upon support from the compiler for a given architecture. +This is disabled for python ports; currently there are issues. + +The blog post referenced in the links section explains how to use them, how to exclude certain ports if needed, and provides a more detailed explaination of those 3 new features along the already existing build-time security options of the Ports Collection and the basesystem build. From nobody Tue Jun 24 09:55:32 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRL1064ghz5yZjj for ; Tue, 24 Jun 2025 09:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRL104bMRz3nmD; Tue, 24 Jun 2025 09:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758932; 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=lxynGXCTVXggLcGarMs/d2BVnR5e/J6pLOC/PmtWgcM=; b=SS5tP9tQ0JBZGvkYiU3pQ/mF/lQ8keNLykgquILz500gyP/9JIm58jbyEEdyl5IW/q8VPi N9y9ORsFxq/UUcX+6FS191Dv+NoUpV2eYmRV6HN7CvPPA4yaIvP+EHgi/55+G7Y53EzXEX GPHaEHrfPkba3mQ/R88tiGKUKw4HfUiNTpZjddBLAKozliBfRs7Sc0VrQp5+TFUntLL3ZL X5wfKUKZDUpwoBgBjbmBvhs/3a5TS/gcwdUvXQuOTJ89Ix20McO5MiPyDmO0JsWA7svl9Z Y4yFKHzDY/riEckPBCIGT+suTzrY9Pwvi57HsAQbyf+OrsFryekhVLWMOq7luQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758932; 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=lxynGXCTVXggLcGarMs/d2BVnR5e/J6pLOC/PmtWgcM=; b=RUgIyKhlCO8O2CXodj8OKAlz6dcXakhIG2MqHSmVFckIlh1GNyduX7yCQoDtrlIR0ifWdJ YdQPNFBXp1sWH56pdsxIgYm17jomdxY7Ou6dOrFob+eDTtt10Ppe44iXcnbXjCGuicFSjA zsyjIk1rrVoA3gre1YSI3zC67w/de///uOn2XRV0WRfHPerXhmzkAPj67GPrXaJQ+8Ssqk akbON9RI2aC34+kU6tNn/Eu1tlSgVMqW+cZGSPWG/Otk0Dw/uMpYmNu0B/t/m9ikXttJ3S 9/NXqwFRJsHbVoK/h9FWIaugf1bfQDMBM1cxOEGbSMhE+Zp+CrhlBv0Xb5konQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750758932; a=rsa-sha256; cv=none; b=tAGfFbINwW8UNn8TMee5eVPYmMQIFVZUX4YIDNOFf7Zik4q4HpiEAszYv6E7JxYN5cdjE/ vDiKbnI/FLLHGKMl0zSfsu1WoUJBdxqJpjPUyaj4ZZn4B3RxGMW/O2Y7AUuDFX0CM8HOVI YpklF3G7vKuO5OFI40g9OrhFQWGnO1PLBbHLTVKIAcEGL51LIKNW3MEdvHu+DcM/ijoN8b 11CrVle9m+YU1AOhO5bsw/MYb6/klPrXYl2uj101IGHhe7cOO3/RYT47i5MVyr1T/fXhs/ HsLz8Idp3fzwucONbYfDn8j/YV3k9coNv1cC5Jn+72ehSVO9+d+q3OPtEAV3bQ== 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 4bRL104BrSzk5Z; Tue, 24 Jun 2025 09:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55O9tWgQ026852; Tue, 24 Jun 2025 09:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55O9tWXp026849; Tue, 24 Jun 2025 09:55:32 GMT (envelope-from git) Date: Tue, 24 Jun 2025 09:55:32 GMT Message-Id: <202506240955.55O9tWXp026849@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 2d3490b048 - main - Status/2025Q2/named-attributes.adoc: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d3490b04887650f543b496acf296bf4fe1e0564 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=2d3490b04887650f543b496acf296bf4fe1e0564 commit 2d3490b04887650f543b496acf296bf4fe1e0564 Author: Rick Macklem AuthorDate: 2025-06-24 09:32:18 +0000 Commit: Lorenzo Salvadore CommitDate: 2025-06-24 09:51:48 +0000 Status/2025Q2/named-attributes.adoc: Add report Reviewed by: status (Pau Amma ) --- .../report-2025-04-2025-06/named-attributes.adoc | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/content/en/status/report-2025-04-2025-06/named-attributes.adoc b/website/content/en/status/report-2025-04-2025-06/named-attributes.adoc new file mode 100644 index 0000000000..d6f5e0e54d --- /dev/null +++ b/website/content/en/status/report-2025-04-2025-06/named-attributes.adoc @@ -0,0 +1,27 @@ +=== Named attribute support (Solaris style extended attributes) + +Contact: Rick Macklem + +Named attributes is the NFSv4 term for what is also known as Solaris style extended attributes. +Since ZFS has its origins in Solaris, the wiring for these exists in OpenZFS. +This little project consists of connecting that wiring up. +This is not intended to replace the extended attribute support already in FreeBSD. +It provides an alternate mechanism for manipulating extended attributes that will be supported for ZFS and NFSv4. +There are a few reasons I think this could be useful (as indicated via email discussion). +This mechanism allows for extended attributes as large as any regular file, which can be partially updated. +Some NFSv4 clients, such as MacOS and Windows, can use these extended attributes but not the FreeBSD/Linux style ones. +(I think MacOS calls these extended attributes fork files and Windows calls them alternate data streams.) +There is software, such as bash, that know how to manipulate these extended attributes. + +The fundamental difference is that this mechanism provides a directory that is not in the file system's namespace, but is associated with a file object. +This named attribute directory can then be read via man:readdir[3] to get the list of extended attributes, which are really just regular files. +These extended attributes are then read/written like any regular file. + +The top level system call interface is man:open[2]/man:openat[2] with the new O_NAMEDATTR flag (called O_XATTR on Solaris). + +Most of the work has been committed to FreeBSD's main for FreeBSD 15. +Once the ZFS patch makes it through review and gets pulled into OpenZFS, the ZFS and NFSv4 support should work. +There are also a couple of manual pages currently under review in phabricator. + +The main thing left to do is update libarchive/tar so that large extended attributes can be archived/retrieved. +(The current FreeBSD extended attribute mechanism is supported by libarchive, but will have size constraints.) From nobody Tue Jun 24 09:55:33 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRL116m4Tz5yZhZ for ; Tue, 24 Jun 2025 09:55:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRL115yWZz3nYQ; Tue, 24 Jun 2025 09:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758933; 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=zdM6Mcj0IYccnKaEaLhIbvtNJMEqI/DFRYrEGbIbVCY=; b=GWXZkV3WvYBqZ2KM4iOXtAlzLuF3XUQw34UQkZj5VZ78D9tQAwzTzcfQ5YRBH6B+cr4ZbW 56vt5Lw7bhQZP9C1gdaXKI+e5d3c2bJitfVizQx0WeRXb0YTytXkiqquLUto+lh5Ayq2Rb GK4V+D3asprKfsb+E9mk0K3LWLhov/yiM3y/a+mAdIJRmwfqFfGM0oYNjeC4OgworfZYyI iHorLcID21qBCdNEpWxj12jrjwGHb0PTrx83b1CMRhaYkP3erXepKvRry9yRQAV/s7mNB8 bnfXAwbj3RVqMMN/MeaJVKHEjrv9OGevXsISlgwLoE0zP3CJx7wnrIsHHBypSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750758933; 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=zdM6Mcj0IYccnKaEaLhIbvtNJMEqI/DFRYrEGbIbVCY=; b=MchTGI3E4yBjXg5XFj+v44HCAIGTjb76BAG97pG7/CK3vBIA27hxt5jF/g7wJ4kAa4rWHi TFQ5Hse+YtovDiw2+PIaoydY7I8jS4mIdYpbM8dvwJFHoVs7ENKCxyyVUURPcYDpiImSLv LjkxDvKYju2zxFaKLYudcN6w1KSqZmknFjY4nZz7ONMLaq8x01jgc0BtCetnpdcum+PTYs vR+FemOWqWTwJOT7pn9wOlK2KC0jSqF0yDUw5pAENWJdrYA0qKdgK/4FkBhxFGspIVbKon piKMv2IKvdei+dy0m0m9vfJHqboYAhJYuoq02Xbs1dRDQEyETgCBB6agZ1ma0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750758933; a=rsa-sha256; cv=none; b=Q7NdyumQwA7g4v59Ibrlpk4DzgRZuqFiUrXukcADXT3XmeleUtNkRsYw4kzbau+NyRxLzh j9oN/BqoSARbdxgC06Al+/bwsHxkCikIziYQVdYgJIvSb5cimJrEGIV22F9TrG4A6joXPl f7dQK82839c1rO4GK0hjnM7gn3uhrgZQTdMzqlH4WqFFGn4tKJ5gMDSallbkZtcwqGI+sl 8MD+EsLkEvDPD0K0PZioiliREM/WzJ3oYygU8gQpyYCpGl4fxd4qqLzVblTDzw+5hzx804 7CF899Xr/jSW3t8HAC73W0F6iZWqZbc5UEwkraf6/V1Eajv7okabDTD792/Q1g== 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 4bRL1153kwzjtZ; Tue, 24 Jun 2025 09:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55O9tXIb026886; Tue, 24 Jun 2025 09:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55O9tXPK026883; Tue, 24 Jun 2025 09:55:33 GMT (envelope-from git) Date: Tue, 24 Jun 2025 09:55:33 GMT Message-Id: <202506240955.55O9tXPK026883@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 8f8e975c79 - main - Status/2025Q2/packrat.adoc: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f8e975c798a328e9b7985bce6e812c6a3193e01 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=8f8e975c798a328e9b7985bce6e812c6a3193e01 commit 8f8e975c798a328e9b7985bce6e812c6a3193e01 Author: Rick Macklem AuthorDate: 2025-06-24 09:50:39 +0000 Commit: Lorenzo Salvadore CommitDate: 2025-06-24 09:51:49 +0000 Status/2025Q2/packrat.adoc: Add report Reviewed by: status (Pau Amma ) --- .../en/status/report-2025-04-2025-06/packrat.adoc | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/website/content/en/status/report-2025-04-2025-06/packrat.adoc b/website/content/en/status/report-2025-04-2025-06/packrat.adoc new file mode 100644 index 0000000000..7ceaaebd22 --- /dev/null +++ b/website/content/en/status/report-2025-04-2025-06/packrat.adoc @@ -0,0 +1,23 @@ +=== Packrat - NFS client caching on non-volatile storage + +Contact: Rick Macklem + +NFSv4.1/4.2 provides support for a feature called delegations. +When a NFSv4.1/4.2 client holds a delegation, the client has certain rights to a file, including a guarantee that no other client will make changes to the file unless the delegation is recalled. +As such, when a client holds a delegation for a file, it can agressively cache the file's data, knowing that it will not be modified by other clients until it returns the delegation. + +This project is intended to allow the NFSv4.1/4.2 client to agressively cache file data on client local non-volatile storage, when the client holds a delegation for the file. +I created a patch long ago to try and do this for NFSv4.0, but it was never at a stage where it was worth using. +This project is a complete rewrite of the patch, done in part because NFSv4.1/4.2 plus other recent NFSv4 related changes makes doing this more feasible. + +The patch is getting stable now, but I am not sure if it will be ready for inclusion in FreeBSD 15 as an experimental feature enabled via a new mount option called "packrat". + +The main thing I still need to do is code a writeback kernel thread. +Right now, dirty chunks stored on client local non-volatile storage get written back to the NFSv4.1/4.2 server upon umount. +This can result in the umount taking a long time (as in many minutes). +To alleviate this, I am planning on implementing a writeback kernel process that will walk the non-volatile storage and write the dirty chunks back. +The trick is to make it aggressive enough that most dirty chunks have been written back when a umount is done, but not so aggressive that it impedes the performance of synchronous NFSv4.1/4.2 RPCs. + +This will be very much an experimental feature, but it is hoped it will allow NFS mounts to be used more effectively, particularily in WAN situations, such as a mobile laptop. + +There is still work to be done, particularily with respect to recovery of delegations after a NFSv4.1/4.2 client restart. From nobody Tue Jun 24 10:51:54 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRMG24nCdz5ydRw for ; Tue, 24 Jun 2025 10:51:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRMG2393Yz46nb; Tue, 24 Jun 2025 10:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750762314; 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=UG2/SM6PnNeUCTomW3UnxjRpOTjFRYIQgndHZ6SJwz0=; b=irpqkAJCcqxhuxX/x9cGCQhgd69AKW0LTPYyuKVA1y5kYPKJKbYzHRehwo1pGURGUB78y6 ESwyj1T4ecfuTf8POkqrgJucT69ZAANh3MdfsoOj6MPpzAz2NxrXUtEeHu5x58EeaC8tHU 3VFn90zpIg0PxcYb6zTb4xXESe0uOxzChHME614tzlrce51VtS2vx0XtXZOlni6pJYkEJ9 Pdw5ANKlVqJ3nqDeugPiY2Mp83Wav5UP1Ns/hV7OdLteDG90kvl3jcZIPtpsUCHMnUakDK T29pyIa6UvQlPwRYUm0QfjnGVG5yS5gLoP6ufvLLZmQyrMjT0Hz1OEROuBU4iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750762314; 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=UG2/SM6PnNeUCTomW3UnxjRpOTjFRYIQgndHZ6SJwz0=; b=sL+3IcY+EmEgJsTk5CP2F9+mzXQAakrj6JDNFfOF4/Ua4tKvvCCSiB4FNhHlWTT73vAkqt Q9WGE71Ayd8fUHGgcpM6e/CD7SthsnM6uRxO3Isw9dlsmz0e2uzZDAp8RXFjGkATQJ9h/N uipc2zPhUifyWcU7G7N6Ix3EL396VmWbwZO8KeIBqomr7SdOKIwS0b6Xiojk1UMCDQL+QQ gOOt5IyVvW3FziX7sxUFi1GLahwrw3Qljwiwp49H4orCm/TPhfKYsLqd7eEuNuoGzQyFvm SoSAvFA3wckCKNOokQxoQjSSTiu2oBZmiB9T3LT7UsbmMWlUquQiHjXMZdGsaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750762314; a=rsa-sha256; cv=none; b=yYWaWX4g8FBMGu0J9rv3yMKkM9ZCs0ZOqzIf+9e5jnSOCSoEO719TMTGwcvn5rKkz/GGKX w29Q3VUJlbeCwxZaMRFpo4qaQvUiJK+/F69XnyLm29JtHmmWduKm6BZo5GhkV8v9u196/3 Wf3lADkqfCCjFuRLJBucqL7e8HwWBZOoSspEMuDyeTcIxcJoA/OK1u7BLUF+OGozytNsBF FkOGIygYM+VspxIOc7LJylkoVXTxx+BcgKf5SERkw8UeAGkj59IR7AWRSpB0rdro127J94 nndTiSdpF563eAtberC/ZVfRL0blw1UhZkLgFUBXukQFfBq3BhUJaGAuAXZj8Q== 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 4bRMG22KPDzlBd; Tue, 24 Jun 2025 10:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55OAps49034617; Tue, 24 Jun 2025 10:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55OAps1W034614; Tue, 24 Jun 2025 10:51:54 GMT (envelope-from git) Date: Tue, 24 Jun 2025 10:51:54 GMT Message-Id: <202506241051.55OAps1W034614@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Maxim Konovalov Subject: git: 80394bc1a9 - main - Status/2025Q2: spell List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80394bc1a9845c318671c3e7ea322ddb0f3bc390 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/doc/commit/?id=80394bc1a9845c318671c3e7ea322ddb0f3bc390 commit 80394bc1a9845c318671c3e7ea322ddb0f3bc390 Author: Maxim Konovalov AuthorDate: 2025-06-24 10:50:05 +0000 Commit: Maxim Konovalov CommitDate: 2025-06-24 10:50:05 +0000 Status/2025Q2: spell --- website/content/en/status/report-2025-04-2025-06/packrat.adoc | 8 ++++---- .../content/en/status/report-2025-04-2025-06/ports-security.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/content/en/status/report-2025-04-2025-06/packrat.adoc b/website/content/en/status/report-2025-04-2025-06/packrat.adoc index 7ceaaebd22..f496bccc9c 100644 --- a/website/content/en/status/report-2025-04-2025-06/packrat.adoc +++ b/website/content/en/status/report-2025-04-2025-06/packrat.adoc @@ -4,9 +4,9 @@ Contact: Rick Macklem NFSv4.1/4.2 provides support for a feature called delegations. When a NFSv4.1/4.2 client holds a delegation, the client has certain rights to a file, including a guarantee that no other client will make changes to the file unless the delegation is recalled. -As such, when a client holds a delegation for a file, it can agressively cache the file's data, knowing that it will not be modified by other clients until it returns the delegation. +As such, when a client holds a delegation for a file, it can aggressively cache the file's data, knowing that it will not be modified by other clients until it returns the delegation. -This project is intended to allow the NFSv4.1/4.2 client to agressively cache file data on client local non-volatile storage, when the client holds a delegation for the file. +This project is intended to allow the NFSv4.1/4.2 client to aggressively cache file data on client local non-volatile storage, when the client holds a delegation for the file. I created a patch long ago to try and do this for NFSv4.0, but it was never at a stage where it was worth using. This project is a complete rewrite of the patch, done in part because NFSv4.1/4.2 plus other recent NFSv4 related changes makes doing this more feasible. @@ -18,6 +18,6 @@ This can result in the umount taking a long time (as in many minutes). To alleviate this, I am planning on implementing a writeback kernel process that will walk the non-volatile storage and write the dirty chunks back. The trick is to make it aggressive enough that most dirty chunks have been written back when a umount is done, but not so aggressive that it impedes the performance of synchronous NFSv4.1/4.2 RPCs. -This will be very much an experimental feature, but it is hoped it will allow NFS mounts to be used more effectively, particularily in WAN situations, such as a mobile laptop. +This will be very much an experimental feature, but it is hoped it will allow NFS mounts to be used more effectively, particularly in WAN situations, such as a mobile laptop. -There is still work to be done, particularily with respect to recovery of delegations after a NFSv4.1/4.2 client restart. +There is still work to be done, particularly with respect to recovery of delegations after a NFSv4.1/4.2 client restart. diff --git a/website/content/en/status/report-2025-04-2025-06/ports-security.adoc b/website/content/en/status/report-2025-04-2025-06/ports-security.adoc index d4b4211b77..8fb04f26d6 100644 --- a/website/content/en/status/report-2025-04-2025-06/ports-security.adoc +++ b/website/content/en/status/report-2025-04-2025-06/ports-security.adoc @@ -21,4 +21,4 @@ Zero call-used registers at function return to increase program security by eith This depends upon support from the compiler for a given architecture. This is disabled for python ports; currently there are issues. -The blog post referenced in the links section explains how to use them, how to exclude certain ports if needed, and provides a more detailed explaination of those 3 new features along the already existing build-time security options of the Ports Collection and the basesystem build. +The blog post referenced in the links section explains how to use them, how to exclude certain ports if needed, and provides a more detailed explanation of those 3 new features along the already existing build-time security options of the Ports Collection and the basesystem build. From nobody Tue Jun 24 22:44:03 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRg3l33VCz60MtV for ; Tue, 24 Jun 2025 22:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRg3l2VVYz3HSh; Tue, 24 Jun 2025 22:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750805043; 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=MfeAzQLAWipvMaESojZrHiO0s4o8PpMp86yXExbcyzY=; b=ftygL/YlSH/Jn0dbCl1yPeJjZe28VR3piTicT2whjox7bbOsjBNWNTbDNmlEVq/uesoVvw hsqX1epEfu8CvxX6jazmjDrXubnUqoHrdeh84V4ejrl5u3b0ckarBjdkgcLQqHpTtOafCu YMnUkDn+6rcso6TXy6ZBvhKIO+nQPTBEgnp8hOB5AXkCPMkQaargCzfE7piNZb57/PWjBf zfESDoN7ZAaC49Cl2NgEqenPX8sfo2842wgRz6N1l2Gw/Mf8oxBtpEr1Ad6emMEoY9xdRm 32pjyrB7Oo5xbEKAB2KeMGqpAiUjwucCu3uJK5JL4k8NP325SsoLeoWCNoBvnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750805043; 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=MfeAzQLAWipvMaESojZrHiO0s4o8PpMp86yXExbcyzY=; b=EWdnn/R+0PFk1xPlhuT2k0ZGfdvEWYK3fRI5C5OkZtJaD1IgiKbp2rRuKpriWNFPustaZR XIYNmWly0a17qdbL/r+lIeBCUsDpBR/Y48ltdkJZd0tmC/5Jzziw4/AadnjK/Ee5oZMbLA G4Xc0nnICsEu2UcrJOAHWek9LiDMqHXlino5jhLqCaD1P55PTtsN0ADJB1CQxf1DTe3f4s Yl2bMvEQalUkLpEDjWbccLIhSri/2+VqksdgrNq307mI7/Tbcw9Yfeaqh6B3Z2rhxyv6Y1 MBnmonbI/8RkfarnCw8XDHzcmCkPXnPh9Lkl5P/aDFDcsESwWP9UAFQ6CdyjjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750805043; a=rsa-sha256; cv=none; b=QQbCP+8wuHhH6CFheadzHoo8Y1HSWVCWb3NuZBBA9PXofVjKQx2w/0pMhLLVT0QESjqqNx twYj8QQU16TF8QVQNN6o4ggSj8dq2VV1BWX0qomOftca8ooFD3+YAF1CbbH09Y9Okug3g3 NaLliVFD4fHrx8Cprqupki/10W5I/zlHu1ph3eyEu2+XDayXmj3mcTGFDVvFjHFoh+GZXX okDJ091kK4huAjLdMluyFvmGmy8KMYcpkwfUxd8XckXpTh58K9JrkwOKNmsNVGzdx+gCM4 Q6zZt8tEOu+DoWfcBSA8Tsq6InuB4t86RH1a25d+ZoBGRUIcIA3LW3e8hYQXgA== 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 4bRg3l1zRgz16WP; Tue, 24 Jun 2025 22:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55OMi3KC073260; Tue, 24 Jun 2025 22:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55OMi30q073257; Tue, 24 Jun 2025 22:44:03 GMT (envelope-from git) Date: Tue, 24 Jun 2025 22:44:03 GMT Message-Id: <202506242244.55OMi30q073257@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: 376d9d5f22 - internal/admin - mentors: release ziaee@ from mentorship List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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/internal/admin X-Git-Reftype: branch X-Git-Commit: 376d9d5f2274c27941602552d7a1aa720518c8c2 Auto-Submitted: auto-generated The branch internal/admin has been updated by mhorne: URL: https://cgit.FreeBSD.org/doc/commit/?id=376d9d5f2274c27941602552d7a1aa720518c8c2 commit 376d9d5f2274c27941602552d7a1aa720518c8c2 Author: Mitchell Horne AuthorDate: 2025-06-24 22:36:16 +0000 Commit: Mitchell Horne CommitDate: 2025-06-24 22:36:16 +0000 mentors: release ziaee@ from mentorship Discussed with: carlavilla Approved by: doceng (implicit) --- mentors | 1 - 1 file changed, 1 deletion(-) diff --git a/mentors b/mentors index 16b40c4dd6..79aefd8e0b 100644 --- a/mentors +++ b/mentors @@ -9,4 +9,3 @@ # Mentee Mentor Optional comment mhorne 0mp -ziaee carlavilla, mhorne From nobody Wed Jun 25 15:32:04 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bS5Qs2sN3z609sk for ; Wed, 25 Jun 2025 15:32:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS5Qs0scBz40qk; Wed, 25 Jun 2025 15:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865525; 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=QadisMBHHwNAXji/jYQk0wwDwSKAOTbYoERIpL2BtkU=; b=RYuyU3RuB1I0kiiMOfUwzVrSUDQsyGgBuLvLIbbICAa6ksvjcJLCWslU5cKgyCcyayBjtL nlx6mFrs2DRBMF9J9M82JKAz5dQsqaJkuG4nwjiwDVtUqYhwx7egLmpmz0LdhiCHYuIega maVMNQS0SWhVQIjeHeK7NZ9Z8lJeRIONPJompNkw9XeLAt2Jx28cvClro18VDA1CFEF+k/ B+Lxa6Wbfw/b3fojTwxgnZIgj0/SuKvKCXAUBO5EWt5SBM3m/MB+QUGoAJNstERl7o170d tHRC9YI9XGceGlx+YpHVeBw0PpHAI7w+M6CRMtXFgZfOjNpCrqHsbBnllGao6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865525; 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=QadisMBHHwNAXji/jYQk0wwDwSKAOTbYoERIpL2BtkU=; b=VtMjCgzh+7//yPu/2rKwxSjhDkUHbOh5KZEJEf6JsPcfZAAhMNK0WONo2BDk1Q1OGsMQfQ 6OBWEISmSW8HYwdEwVh8tOMyEMwpI8uQkN5DYVRKFix/7XS2t+E0rPk/3br5bLzjbVNuYf 2ZnRXylyaWqxpT8TSlUILntf2AjBqQm2pXrlaoHcP6Tk1/auYX4f8WL0P10fP2neWVxUfK me5AS4UBsjRTb46+jrTLS6JFzAQuV1fhRoNIeIbD0vJ2piIH/zxXngJDq9Qx5JLen96pG7 5awlXT22Ky528ZCrOR2YZoBzGVOq3rKk46zd9jpc0ts/iLa44Q5IVVIZCjGdxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750865525; a=rsa-sha256; cv=none; b=VPbnP1BAhOBanAdcDE8n3wgXEMAqJRYjngUb7Le4sukAo7FKi0JnDYmklCknrVdDJGAixh qzl+pvI7PqjSAcrWcWbXyHnfSHKXfnw13Hl1V6jlGpmRhtuwr/c1gs0a1XuXcsbUkTHlWD /ob9I3QTNmhCbyl4YJhjMUYPzFXiqK2piN1PHtDa+Qe84Zj97cQdkzR0vHIcAiPExfOJST kQTd8sMpu9Nc43kOkvPJ0O1yRusiZIle8bZJeJmUyo0Wk02YxD+akvSqpsd8aGthb9ObN6 S5P5qmJjD3OVLQdrr3iyQAQsPAkUGlFFuPYWHoLcfb2WGzKRnLQa89DxVLid5g== 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 4bS5Qs0HSKz7fx; Wed, 25 Jun 2025 15:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PFW4tk069009; Wed, 25 Jun 2025 15:32:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PFW4WS068986; Wed, 25 Jun 2025 15:32:04 GMT (envelope-from git) Date: Wed, 25 Jun 2025 15:32:04 GMT Message-Id: <202506251532.55PFW4WS068986@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 7872626fdd - main - Add information about jointing the FreeBSD GitHub org List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: 7872626fddda5bd3c8406fcf2ac7e92d30605619 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=7872626fddda5bd3c8406fcf2ac7e92d30605619 commit 7872626fddda5bd3c8406fcf2ac7e92d30605619 Author: Warner Losh AuthorDate: 2024-12-04 16:36:43 +0000 Commit: Warner Losh CommitDate: 2025-06-25 15:31:26 +0000 Add information about jointing the FreeBSD GitHub org Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index bd16cc3585..90db1ecdf2 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1877,6 +1877,14 @@ Once you're done, `git commit` and you'll have the remainder in your tree. You can run it multiple times as well, and even over multiple files (though I find it easier to do one file at a time and use the `git rebase -i` to fold the related commits together). +===== Joining the FreeBSD GitHub oranization. + +**Q:** How do I join the FreeBSD GitHub organization? + +**A:** Please see https://wiki.freebsd.org/GitHub#Joining_the_Organisation[our GitHub Wiki Info] page for details. +Briefly, all FreeBSD committers may join. +Those who are not committers who request joining will be considered on a case by case basis. + ==== Cloning and Mirroring **Q:** I'd like to mirror the entire Git repository, how do I do that? From nobody Wed Jun 25 15:32:06 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bS5Qt409Fz609sm for ; Wed, 25 Jun 2025 15:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS5Qt2DWSz413Y; Wed, 25 Jun 2025 15:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865526; 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=nAB6K4wH4CyoUAUEkAhC3VnMUt3JJxx/AQbPx4w0Q/4=; b=Zx+vVfR8aOKD50soGZQ62lbaezW14smrne6+X/vi1Vu4yXU4EESEM7Pit/krDJMRaF0xYM y3WNnXNtf022bK6oNkJknNLWQz2/ddBbqPV8Ku/qXbXdQ85lI4Rh6zPV9A3CWhGe7kS+Yo eg71SAUAPCAqtFxzbdEtb9mp7xXtpP/+aMN01NtX/Cq5vUxEL+2Lq23i6+jUTR4/d0ZHvg tp4Yvf7LqSVu6pjMrEYErdfcU6MDlS0X4Dx9rNMoOXes0WoeRBvgx8ZYsA5KVsv5Np0WF/ DnQfbr/exgNO5pwI2iW3uhXjaJYM0CK5MFjQKeRdyjhRcKHZRsKrsHm0PkhxOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865526; 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=nAB6K4wH4CyoUAUEkAhC3VnMUt3JJxx/AQbPx4w0Q/4=; b=T1CzBUF/aIUB9je/92MCrkLF1RhIZ5VqYDh6y5I7qqRmf2dVyGTEa+6o0e9CZuapdqGKec b/NRsOhTzBInxieWljekR3Ng5YKxtQatvBb1p/R9AXtPBxfgK4WpUavOXdzB+E92I9OV/y q+IYXD8Y+fgvgyOfyutlctj6Sr/D/Sy43IYO21pA09LCx6Irtqc2enwsTwM0gfVHx1z7Rv UwtcqbV7oEYgQ4lUQWIduoKnl+jMaEmhwN5ELEH3HIl39sNjVvfhZlysGNv7i4nSxhLNb/ aDUYUK6oYLEoasS8WSAPNgAw1uO4CRHUxBkRa5svQQrQtynR+uTelBRp8eilxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750865526; a=rsa-sha256; cv=none; b=uzMAUUnIanHiLX2sQh+3UW6ik6oLB5Zms4bikBcJ5EoM1G9E2R8B7NCR9dyVX7sCDSzEFe O+ClnYz22m5jVhPoa1/cr3X0oDqsVYtiJp3Ov6+Dl+5KI+uFks2l/GiXe1jaARsRAwAbzT hefpp1QFZ2NVJzmf1ZPrHfkSXK/ayN1pHYAQSDHZBTiRjyoZW2FRP1qNNrj8560NVGj19k 0KBmzqgZoa+a40xh2626AAtDV3XQJWetRwz1xopkQULnNSWLDNgrSbYrbwBL5MXe0qqDxP ekMPjQyqj17VuE8eEzFe/kweHb/yu3jqit1dIEic4nl+0T3WWLObxMl9B7ksrw== 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 4bS5Qt1VPkz7cb; Wed, 25 Jun 2025 15:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PFW6Js069195; Wed, 25 Jun 2025 15:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PFW6IA069192; Wed, 25 Jun 2025 15:32:06 GMT (envelope-from git) Date: Wed, 25 Jun 2025 15:32:06 GMT Message-Id: <202506251532.55PFW6IA069192@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: be9db83332 - main - git primer: Update info about rebasing in a few places List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: be9db83332da2904403179527cb829628f13113a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=be9db83332da2904403179527cb829628f13113a commit be9db83332da2904403179527cb829628f13113a Author: Warner Losh AuthorDate: 2024-12-04 17:05:49 +0000 Commit: Warner Losh CommitDate: 2025-06-25 15:31:27 +0000 git primer: Update info about rebasing in a few places Experience has shown that some of the advice in this primer is awkward and clunky. Address some of that by refining what we suggest. Sponsored by: Netflix --- .../en/articles/committers-guide/_index.adoc | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 90db1ecdf2..d52aab2ee5 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1609,9 +1609,9 @@ The following answer assumes you committed to `main` and want to create a branch [source,shell] .... -% git branch issue # Create the 'issue' branch -% git reset --hard freebsd/main # Reset 'main' back to the official tip -% git checkout issue # Back to where you were +% git checkout -b issue # Create the 'issue' branch +% git checkout -B main freebsd/main # Reset main to upstream +% git checkout issue # Back to where you were .... ===== Ooops! I committed something to the wrong branch! @@ -1632,8 +1632,15 @@ It also assumes that it's the last commit on wilma (hence using wilma in the `gi % git reset --hard HEAD^ # move what wilma refers to back 1 commit .... -Git experts would first rewind the wilma branch by 1 commit, switch over to fred and then use `git reflog` to see what that 1 deleted commit was and -cherry-pick it over. +If it is not the last commit, you can cherry-pick that one change from wilma onto fred, then use `git rebase -i` to remove the change from wilma. + +[source,shell] +.... +# We're on branch wilma +% git checkout fred # move to fred branch +% git cherry-pick HASH_OF_CHANGE # copy the misplaced commit +% git rebase -i main wilma # drop the cherry-picked change +.... **Q:** But what if I want to commit a few changes to `main`, but keep the rest in `wilma` for some reason? @@ -1748,6 +1755,8 @@ How do I recover? **A:** This can happen when you invoke the pull with your development branch checked out. +Many developers use `git pull --rebase` to avoid this situation. + Right after the pull, you will have the new merge commit checked out. Git supports a `HEAD^#` syntax to examine the parents of a merge commit: @@ -1762,9 +1771,11 @@ Then you simply reset your branch to the corresponding `HEAD^#`: [source,shell] .... -git reset --hard HEAD^2 +git reset --hard HEAD^1 .... +In addition, a `git pull --rebase` at this stage will rebase your changes to 'main' to the latest 'freebsd/main'. + **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. From nobody Wed Jun 25 15:45:12 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bS5k10vvcz60BkH for ; Wed, 25 Jun 2025 15:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS5k10DNDz45y6; Wed, 25 Jun 2025 15:45:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750866313; 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=gNEdgGUzzpzVkn57bBnjUcF//eEBV+oh+oZDJCAsWL0=; b=qIr4rwm6ZMOHdbI6Y0811rewR2i76ofx4uVInrCerie8oCaZK9WpUHLyEnHxL+jCYHoo9p zP7C2/t7WZ+IWhXX1iHiIsh2L09WhkG2Ia+1TQZnXxwsmR4qx25/Xr4/3cCZP22iiS0BUL XGCDcdFIfkwKY7Re/FCnh1G8vEKONHdWT+bJMTpx+QnhYiEOyOsqqFXXjVEP7EBCWDCZX3 T2wJjfU/0rxFzPxq3e/gvvlShCGZ5oEUYQvCYWAX5kQJpfvnJ4Q7h7YCjp6ImbUCd7mYz9 nVQuertltLiCfep0OHeadNtPud0AjNZqGi60QkD1lV5xTWXHT16m1qU0K6pM4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750866313; 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=gNEdgGUzzpzVkn57bBnjUcF//eEBV+oh+oZDJCAsWL0=; b=RaXUm08GYCr6vdQgY8gY00N/Wn7nubpyQZ5cnbBoUeQsPiQeyrmsIQUii9/W4HMWviRSKN Kz5NYPeNtX/Srat2I/UhgfjsYB6EEZXSIcgWsYDi/eHQXIlUt0QdpaX6W2gS6NMZxANchX 4anA+q53JbX+5SZKv47LbLRRZu8CjZzm40G90iyR3/IWJ4jEqrmjr+xcPjvviG52ItCgzy IezYVXwsDsWC9bErJBjFKjzRZt1+uKxPhfTl7fZIOm4kFqYT6EeIMFQDlC2btVC9ORWGWj dC6eB16MAAaV65Xq8LeSJN58X+RUnxVZ2EHjd6MNkBI4m+GWwQi5RSTCwG9KUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750866313; a=rsa-sha256; cv=none; b=Nu3KOqU3VAG2PFM4XJ2W6oxAdDdgp3AJXFVbxDDiTMAKZAro+UV4Dw9SnLDe+HtkdGPLbq f32c/+Gmo5jB5f/4MlnD/bLdwnxyutz5/KjKFB67h+viSCzmEMWE2MkGnW3MbRyei63W3g 11ayYzXmOD4fdyNCk8M0EXPk1/hgbQuEaAqKIG/8JG4buxc7x6TcCbF/riw9EHhBjFyCmH HYGHva76CR1gMrqORe1mtGEYt/HYNlO3qYX5iZ75D33m4waMjSkMPQxWoNjGYpMoY0sPm4 q5IRwhaX9f+96KSdOyaLUFChMiWgpHFHOsU7UwaDk3MkkaCLOC1ukUOBluKhSg== 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 4bS5k06B1Sz7xy; Wed, 25 Jun 2025 15:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PFjCai090248; Wed, 25 Jun 2025 15:45:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PFjC94090245; Wed, 25 Jun 2025 15:45:12 GMT (envelope-from git) Date: Wed, 25 Jun 2025 15:45:12 GMT Message-Id: <202506251545.55PFjC94090245@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 03a80207d4 - main - handbook: ddd was removed in 2019 List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: 03a80207d420844279c975c7bbfe9ae056fe154e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=03a80207d420844279c975c7bbfe9ae056fe154e commit 03a80207d420844279c975c7bbfe9ae056fe154e Author: Warner Losh AuthorDate: 2025-06-25 15:34:37 +0000 Commit: Warner Losh CommitDate: 2025-06-25 15:34:37 +0000 handbook: ddd was removed in 2019 Remove obsolete ddd info: that port stopped working with gdb protocol updates in about 2018, and was removed in 2019. It was abandoned upstream around 2009 (last release). A new maintainer appeared in 2013, but apparently didn't work out. Two new maintainers appeared in 2021 and started new releases in 2023. A new port hasn't appeared, though, so remove dangling references. This whole section needs a rewrite, though, since dcons is so limited (first 4GB only) and firewire is getting rare. All that should likely just be removed. We need a good writeup on doing USB-C debugging with the so-called USB-A to USB-A cable. Sponsored by: Netflix --- .../en/books/developers-handbook/kerneldebug/_index.adoc | 10 ---------- .../en/books/developers-handbook/kerneldebug/_index.po | 15 --------------- 2 files changed, 25 deletions(-) diff --git a/documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc b/documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc index 04d850d230..006ae4178a 100644 --- a/documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc +++ b/documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc @@ -805,16 +805,6 @@ There exists a GDB mode for man:emacs[1]; this is what you will need to add to y M-x gdba .... -And for DDD ([.filename]#devel/ddd#): - -[source,bash] -.... -# remote serial protocol -LANG=C ddd --debugger kgdb -r :12345 kernel -# live core debug -LANG=C ddd --debugger kgdb kernel /dev/fwmem0.2 -.... - === Dcons with KVM We can directly read the man:dcons[4] buffer via [.filename]#/dev/mem# for live systems, and in the core dump for crashed systems. diff --git a/documentation/content/en/books/developers-handbook/kerneldebug/_index.po b/documentation/content/en/books/developers-handbook/kerneldebug/_index.po index 63b7d1f9aa..7e6bdfbd81 100644 --- a/documentation/content/en/books/developers-handbook/kerneldebug/_index.po +++ b/documentation/content/en/books/developers-handbook/kerneldebug/_index.po @@ -1410,21 +1410,6 @@ msgid "" "M-x gdba\n" msgstr "" -#. type: Plain text -#: documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc:809 -msgid "And for DDD ([.filename]#devel/ddd#):" -msgstr "" - -#. type: delimited block . 4 -#: documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc:816 -#, no-wrap -msgid "" -"# remote serial protocol\n" -"LANG=C ddd --debugger kgdb -r :12345 kernel\n" -"# live core debug\n" -"LANG=C ddd --debugger kgdb kernel /dev/fwmem0.2\n" -msgstr "" - #. type: Title === #: documentation/content/en/books/developers-handbook/kerneldebug/_index.adoc:818 #, no-wrap From nobody Wed Jun 25 22:04:16 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bSG7N5MzCz5ybBY for ; Wed, 25 Jun 2025 22:04:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSG7N48pbz3Zym; Wed, 25 Jun 2025 22:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750889056; 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=3dsv5CJEX9kt4zJkJ8C7OWWTvtuSAiskjVPPbM8Ftw4=; b=djSLRPPRkMmREj2PtqKrgsUO93GHCYvj3kG5kusiBU+s49KVgyR97ZQYWcxv+FPYVFJrmF sx5SnZb/NjoeLb8DHyuWVSzp/+2JnKIz67rG7mfmk82MZtbIm1Ckv7xbtWfAZKjWpSvdnc INkESGS25r/jzuCVccJCFBxI4dgTKH8c/QDl7vopFj7zpdGEZmdZAWXlimoyiqS4TDWL/p FQikgshiotPkk6EnwrXOiv6ZYQTew1dH6qpMhZ9JVLEDUZFNbCixnEeBfuUT/UinaYts4a rOCR1hDyhoGKyDaG5yMMTdux56KH9nz9fY81hzFC1XtUoLyq5YqvX66S5bSvnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750889056; 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=3dsv5CJEX9kt4zJkJ8C7OWWTvtuSAiskjVPPbM8Ftw4=; b=rjv+wc/7Acrg2AuJq2NIwEaiNKiKd+Gxmuy9/o1szNxeMQXR2KRFQtowrhvpPGsOG37Lak rzqyZqgRWvnu1otiwp3qe3c146EnGdD3/CYPmceThaBjBaUBXXH5bkJ8LiFHkzFSfkFHN0 yU9+iWznBYJpaZybLyYDHm2VHMMnFlTPm+87LT6YdpwKGCA1zfZNnG4sU4pT4NSFgVTnrV HUXD0cDou4G/nN/8sJUfuhMmazSQg46RZEkF3Bh6nibcGSQAtmi+SwNKrhqf7QmWJB+ZvK DfO3RGgit7HYLzzPB+LQxkOIMiLNNVxU/mZ+Vpmh5eZnmq6nFYcqmQf0nkfXNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750889056; a=rsa-sha256; cv=none; b=EbLwUDHXqN9OKwpgg97YOhJZAcN7yy9bO5zDSUVH7pfXBJiBkT+9LRD8XfGGcovoELTaJd GWtL5CxaPOVmq6exvbAYN6gSo+oe8gB0tLhdTr7S1IZKSHEyRVQjMmruf9uIZVgL2oO7Yk g/HzlAyLeMU2ovsJEPjyMAASl/avCngLamxyeziDf9Q9lYmW4DhlWCnPRjWCoy9V3AT1xb rvlVj2h90hSgb6rhP6h7MJDwjxbIrXdKC2xoPcDJwRbNjgZmrpAKD36OT2JzU6ivX4364b h683jrfE5lFs4eQjcPsvHvEA3fT5hk6qdPrnaGQ5GSeHoE5Wog8xo/xYQsAnEw== 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 4bSG7N36HHzcWC; Wed, 25 Jun 2025 22:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PM4G79006217; Wed, 25 Jun 2025 22:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PM4GTD006213; Wed, 25 Jun 2025 22:04:16 GMT (envelope-from git) Date: Wed, 25 Jun 2025 22:04:16 GMT Message-Id: <202506252204.55PM4GTD006213@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: b4b491d498 - main - documentation/nl: add skeleton files for articles and books. List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: b4b491d4980e48bf6bd3b36197af7f3c7c443997 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=b4b491d4980e48bf6bd3b36197af7f3c7c443997 commit b4b491d4980e48bf6bd3b36197af7f3c7c443997 Author: Rene Ladan AuthorDate: 2025-06-25 21:02:37 +0000 Commit: Rene Ladan CommitDate: 2025-06-25 21:02:37 +0000 documentation/nl: add skeleton files for articles and books. Obtained from: Dutch Weblate instance --- documentation/content/nl/articles/_index.adoc | 4 ++-- documentation/content/nl/articles/_index.po | 30 +++++++++++++++++++++++++++ documentation/content/nl/books/_index.adoc | 4 ++-- documentation/content/nl/books/_index.po | 30 +++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 4 deletions(-) diff --git a/documentation/content/nl/articles/_index.adoc b/documentation/content/nl/articles/_index.adoc index de739232b6..b701e570e5 100644 --- a/documentation/content/nl/articles/_index.adoc +++ b/documentation/content/nl/articles/_index.adoc @@ -1,8 +1,8 @@ --- -title: Articles layout: total-list +title: Artikelen --- -= Articles += Artikelen {{< list-articles-directories >}} diff --git a/documentation/content/nl/articles/_index.po b/documentation/content/nl/articles/_index.po new file mode 100644 index 0000000000..50b3c66dda --- /dev/null +++ b/documentation/content/nl/articles/_index.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The FreeBSD Project +# This file is distributed under the same license as the FreeBSD Documentation package. +# René Ladan , 2025. +msgid "" +msgstr "" +"Project-Id-Version: FreeBSD Documentation VERSION\n" +"POT-Creation-Date: 2022-01-08 11:34-0300\n" +"PO-Revision-Date: 2025-06-24 20:10+0000\n" +"Last-Translator: René Ladan \n" +"Language-Team: Dutch \n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. type: Title = +#: documentation/content/en/articles/_index.adoc:1 +#: documentation/content/en/articles/_index.adoc:6 +#, no-wrap +msgid "Articles" +msgstr "Artikelen" + +#. type: Plain text +#: documentation/content/en/articles/_index.adoc:8 +msgid "{{< list-articles-directories >}}" +msgstr "{{< list-articles-directories >}" diff --git a/documentation/content/nl/books/_index.adoc b/documentation/content/nl/books/_index.adoc index 89516d974e..0f57cff961 100644 --- a/documentation/content/nl/books/_index.adoc +++ b/documentation/content/nl/books/_index.adoc @@ -1,8 +1,8 @@ --- -title: Books layout: total-list +title: Boeken --- -= Books += Boeken {{< list-books-directories >}} diff --git a/documentation/content/nl/books/_index.po b/documentation/content/nl/books/_index.po new file mode 100644 index 0000000000..aceb4ad9bb --- /dev/null +++ b/documentation/content/nl/books/_index.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The FreeBSD Project +# This file is distributed under the same license as the FreeBSD Documentation package. +# René Ladan , 2025. +msgid "" +msgstr "" +"Project-Id-Version: FreeBSD Documentation VERSION\n" +"POT-Creation-Date: 2022-01-08 11:34-0300\n" +"PO-Revision-Date: 2025-06-24 20:10+0000\n" +"Last-Translator: René Ladan \n" +"Language-Team: Dutch \n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. type: Title = +#: documentation/content/en/books/_index.adoc:1 +#: documentation/content/en/books/_index.adoc:6 +#, no-wrap +msgid "Books" +msgstr "Boeken" + +#. type: Plain text +#: documentation/content/en/books/_index.adoc:8 +msgid "{{< list-books-directories >}}" +msgstr "{{< list-books-directories >}}" From nobody Wed Jun 25 22:04:17 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bSG7P5cZ4z5ybFR for ; Wed, 25 Jun 2025 22:04:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSG7P3rlLz3b3P; Wed, 25 Jun 2025 22:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750889057; 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=BTPiIBQSL1msh2dzxQ91SGXyr5rBbXexSgdcvCXPrvI=; b=hpfThXgDL/Z2aakngkWsChn9eueLNlz855Wk6ndw0YI1+X6K5xRwgbvHLPHYUSqGf0O3+D hSMsZHBdT8rbry5F36/jJRXsHCHDRpVqYz7gZQrFgDu+fjDo7xm6dNB4qaM9RevkE6GMkm dMHZiSa5GY57IvnN/gweV/NDPAgK9E4804SP1+6NSOAWQU9Oe9wywKzSGl/G+5/wzvBXN+ 86O8GkJdz/XP0qHy3OdjndrFnSUvwge0xXGmDpBG4wN1R8y+XbSYf3fdxtcRtIsAXMu79T CjHCv5slJz2Y+AlYggmfxeFuGgOm6wPlnN8H0GzgGkcgqR9rdQJVbTY9xfwZHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750889057; 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=BTPiIBQSL1msh2dzxQ91SGXyr5rBbXexSgdcvCXPrvI=; b=TzRFPTElSfeF1G9oo1cPEJXyRXb8+DyLJCVgejF6HqulBXNrgl4GxIbJnq4Eu6Z1prJ2SN ritqqyHu5IOCrPNJ801GSfJ6X07trbGcVrCg4mFLsJX6QLwXbo52FEeYsNgK/UYv2bbBbS hl0mAO4kjE5uA/sBL75Wy4NEcvXRth5tQMg/mmMuXJd/6FzG3TTZhdmu3iUssf7FlThqmp YMk2s5TI74TWjGKNBuZ/yisk1wppPVave+S/rLr4Zn5ZFuAgedN5gTQ1jrVMz5iGb8nv7M dCz+QYqk2q8Jb0qFolNjxdvtH31xGewbdzTNZc4j+wNKQKLwyp1mrMWuXdl9MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750889057; a=rsa-sha256; cv=none; b=oje9/O1+Jqb1MDhaD588ExoFjkgmhtJs8Tae0d1dQ0Enn2rPJhhFIiljBGtHlPvMPg2RSa 056SXquRphTGHHeuwxM+e5EP7yRsr+JV6EseTdAZr+AMyVp4QbCHhDq1FZU+LkoQHY7+Z+ JUuYPKqKXTqHwz26OgwBd8YsiOx2aUM1HLksUFP95pcs6V7tK2//Tpl1MlH9zEpcK2vJGH 89E7ww3SslO44oZxu3ktcqG69IX2zv3pUmzfduBYNfS2B+cOUwOWZJsilWzkuUXJaNv4D1 AZqLSQ6P5yIp92VK7TfFF1LQIouUZ0E5tpHedBzIIj4zSaozurDa/hTZbBp7YQ== 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 4bSG7P36XRzcDk; Wed, 25 Jun 2025 22:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PM4HSY006255; Wed, 25 Jun 2025 22:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PM4HPB006252; Wed, 25 Jun 2025 22:04:17 GMT (envelope-from git) Date: Wed, 25 Jun 2025 22:04:17 GMT Message-Id: <202506252204.55PM4HPB006252@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: c65b574301 - main - documentation/nl: refresh translation of the "leap seconds" article. List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: c65b574301946db07a5900f44e81e422f154000a Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=c65b574301946db07a5900f44e81e422f154000a commit c65b574301946db07a5900f44e81e422f154000a Author: Rene Ladan AuthorDate: 2025-06-25 21:07:34 +0000 Commit: Rene Ladan CommitDate: 2025-06-25 21:08:24 +0000 documentation/nl: refresh translation of the "leap seconds" article. Obtained from: Dutch Weblate instance --- .../content/nl/articles/leap-seconds/_index.adoc | 32 +-- .../content/nl/articles/leap-seconds/_index.po | 257 +++++++++++++++++++++ 2 files changed, 274 insertions(+), 15 deletions(-) diff --git a/documentation/content/nl/articles/leap-seconds/_index.adoc b/documentation/content/nl/articles/leap-seconds/_index.adoc index 561d3a6ee6..e2087a6b72 100644 --- a/documentation/content/nl/articles/leap-seconds/_index.adoc +++ b/documentation/content/nl/articles/leap-seconds/_index.adoc @@ -1,5 +1,7 @@ --- -title: Ondersteuning voor schrikkelseconden in FreeBSD +description: 'Een korte beschrijving over hoe FreeBSD met schrikkelseconden omgaat' +tags: ["Leap Seconds", "Support", "Verification", "FreeBSD"] +title: 'Ondersteuning voor schrikkelseconden in FreeBSD' --- = Ondersteuning voor schrikkelseconden in FreeBSD @@ -40,33 +42,33 @@ toc::[] [[leapseconds-definition]] == Introductie -Een _schrikkelseconde_ is een ad-hoc correctie van één seconde om de atomaire tijd te synchroniseren met de omwenteling van de aarde. Dit artikel beschrijft hoe FreeBSD omgaat met schrikkelseconden. +Een _schrikkelseconde_ is een aanpassing aan UTC van één seconde op specifieke tijden in het jaar om atomaire tijdschalen met variaties in de aardrotatie te synchroniseren. Dit artikel beschrijft hoe FreeBSD omgaat met schrikkelseconden. -Op het moment van schrijven zal de volgende schrikkelseconde plaatsvinden op 2015-juni-30 23:59:60 UTC. Deze schrikkelseconde zal plaatsvinden op een werkdag voor Noord- en Zuid-Amerika en het Aziatische/Pacifische gebied. +Op het moment van schrijven zal de volgende schrikkelseconde plaatsvinden op 30 juni 2015 om 23:59:60 UTC. Deze schrikkelseconde zal plaatsvinden op een werkdag voor Noord- en Zuid-Amerika en het Aziatische/Pacifische gebied. -Schrikkelseconden worden aangekondigd door http://datacenter.iers.org/[IERS] op http://datacenter.iers.org/web/guest/bulletins/-/somos/5Rgv/product/16[Bulletin C]. +Schrikkelseconden worden aangekondigd door https://www.iers.org/IERS/EN/Home/home_node.html[IERS] op https://datacenter.iers.org/data/latestVersion/16_BULLETIN_C16.txt[Bulletin C]. -Het standaardgedrag van schrikkelseconden is beschreven in https://tools.ietf.org/html/rfc7164#section-3[RFC 7164]. Zie ook man:time2posix[3]. +Standaardgedrag voor schrikkelseconden is beschreven in https://datatracker.ietf.org/doc/html/rfc7164#section-3[RFC 7164]. Zie ook man:time2posix[3]. [[leapseconds-posix]] == De standaardomgang met schrikkelseconden op FreeBSD -De eenvoudigste manier om met schrikkelseconden om te gaan is met de tijdregels van POSIX die FreeBSD standaard gebruikt, gecombineerd met extref:{handbook}network-servers[NTP, network-ntp]. Wanneer man:ntpd[8] draait en de tijd gesynchroniseerd is met de bovenliggende NTP-servers die schrikkelseconden correct afhandelen, zal de schrikkelseconde ervoor zorgen dat de systeemtijd automatisch de laatste seconde van de dag herhaalt. Er zijn geen andere aanpassingen nodig. +De eenvoudigste manier om met schrikkelseconden om te gaan is met de tijdregels van POSIX die FreeBSD standaard gebruikt, gecombineerd met extref:{handbook}[NTP, network-ntp]. Wanneer man:ntpd[8] draait en de tijd is gesynchroniseerd met bovenliggende NTP-servers welke correct met schrikkelseconden omgaan, dan zal de schrikkelseconde ervoor zorgen dat het systeem automatisch de laatste seconde van de dag herhaalt. Er zijn geen verdere aanpassingen nodig. -Als de bovenliggende NTP-servers schrikkelseconden niet correct afhandelen, zal man:ntpd[8] de tijd met één seconde laten verspringen nadat de foutieve bovenliggende server dit opgemerkt heeft en zelf is versprongen. +Als de bovenliggende NTP-servers onjuist met schrikkelseconden omgaan, zal man:ntpd[8] de tijd met één seconde vooruitzetten nadat de afdwalende bovenliggende server het heeft opgemerkt en zichzelf heeft aangepast. -Als NTP niet wordt gebruikt, is het nodig om de systeemklok handmatig aan te passen nadat de schrikkelseconde is verstreken. +Wanneer NTP niet wordt gebruikt zijn handmatige aanpassingen van de systeemklok nodig nadat de schrikkelseconde heeft plaatsgevonden. [[leapseconds-cautions]] == Waarschuwingen -Schrikkelseconden worden wereldwijd op hetzelfde moment ingevoegd: middernacht UTC. In Japan is dit in het midden van de ochtend, in het Pacifisch gebied in het midden van de dag, in Amerika in de namiddag en in Europa in de nacht. +Schrikkelseconden worden wereldwijd op hetzelfde moment ingevoegd: middernacht UTC. In Japan is dat het midden van de ochtend, in het Pacifisch gebied in de middag, in Amerika in de late middag en in Europa in de nacht. -We geloven en verwachten dat FreeBSD, mits voorzien van een correcte en stabiele NTP-dienst, zal werken als ontworpen tijdens deze schrikkelseconde, zoals het tijdens de voorgaande deed. +We verwachten dat FreeBSD, mits voorzien van een correcte en stabiele NTP-dienst, zal werken zoals verwacht tijdens deze schrikkelseconde, net zoals het bij de vorige deed. We waarschuwen echter dat praktisch geen enkele toepassing de kernel ooit om schrikkelseconden heeft gevraagd. Onze verwachting is dat, zoals ontworpen, schrikkelseconden in feite een herhaling zijn van de seconde voor de schrikkelseconde, wat een verassing is voor de meeste toepassingsprogrammeurs. -Andere besturingssystemen en computers kunnen de schrikkelseconde op een andere manier dan FreeBSD afhandelen, en systemen zonder correcte en stabiele NTP-dienst zullen in het geheel niks van schrikkelseconden weten. +Andere besturingssystemen en andere computers kunnen anders met de schrikkelseconde omgaan dan FreeBSD, en systemen zonder een correcte en stabiele NTP-dienst zullen helemaal niks van schrikkelseconden afweten. Het komt voor dat computers crashen vanwege schrikkelseconden, en ervaring laat zien dat een groot gedeelte van alle publieke NTP-servers de schrikkelseconde onjuist kunnen aankondigen en afhandelen. @@ -75,16 +77,16 @@ Probeer er alstublieft voor te zorgen dat er niks ergs gebeurt vanwege de schrik [[leapseconds-testing]] == Testen -Het is mogelijk om te kijken of een schrikkelseconde zal worden gebruikt. Vanwege de aard van NTP kan de test tot 24 uur voor de schrikkelseconde werken. Sommige grote bronnen van referentieklokken kondigen schrikkelseconden slechts één uur van te voren aan. Ondervraag de daemon NTP: +Het is mogelijk om te kijken of een schrikkelseconde zal worden gebruikt. Vanwege de aard van NTP kan de test tot 24 uur voor de schrikkelseconde werken. Sommige grote bronnen van referentieklokken kondigen schrikkelseconden slechts één uur van te voren aan. Ondervraag het NTP-daemon: -[source,shell] +[source, shell] .... % ntpq -c 'rv 0 leap' .... -Uitvoer die `leap_add_sec` bevat wijst op correcte ondersteuning van de schrikkelseconde. Voorafgaand aan de 24 uur die tot de schrikkelseconde leiden, of nadat de schrikkelseconde is verstreken, zal `leap_none` zichtbaar zijn. +Uitvoer welke `leap_add_sec` bevat wijst op correcte ondersteuning van de schrikkelseconde. Voorafgaand aan de 24 uur die tot de schrikkelseconde leiden, of nadat de schrikkelseconde is verstreken, zal `leap_none` zichtbaar zijn. [[leapseconds-conclusion]] == Conclusie -In de praktijk zijn schrikkelseconden meestal geen probleem op FreeBSD. We hopen dat dit overzicht helpt met wat te verwachten en hoe schrikkelseconden gladder te laten verlopen. +In de praktijk zijn schrikkelseconden meestal geen probleem op FreeBSD. We hopen dat dit overzicht helpt met wat te verwachten en hoe schrikkelseconden soepeler te laten verlopen. diff --git a/documentation/content/nl/articles/leap-seconds/_index.po b/documentation/content/nl/articles/leap-seconds/_index.po new file mode 100644 index 0000000000..a21d5919a9 --- /dev/null +++ b/documentation/content/nl/articles/leap-seconds/_index.po @@ -0,0 +1,257 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The FreeBSD Project +# This file is distributed under the same license as the FreeBSD Documentation package. +# Danilo G. Baio , 2021. +# René Ladan , 2025. +msgid "" +msgstr "" +"Project-Id-Version: FreeBSD Documentation VERSION\n" +"POT-Creation-Date: 2022-02-01 09:21-0300\n" +"PO-Revision-Date: 2025-06-24 21:10+0000\n" +"Last-Translator: René Ladan \n" +"Language-Team: Dutch \n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. type: YAML Front Matter: description +#: documentation/content/en/articles/leap-seconds/_index.adoc:1 +#, no-wrap +msgid "A short description of how leap seconds are handled on FreeBSD" +msgstr "Een korte beschrijving over hoe FreeBSD met schrikkelseconden omgaat" + +#. type: Title = +#: documentation/content/en/articles/leap-seconds/_index.adoc:1 +#: documentation/content/en/articles/leap-seconds/_index.adoc:7 +#, no-wrap +msgid "FreeBSD Support for Leap Seconds" +msgstr "Ondersteuning voor schrikkelseconden in FreeBSD" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:39 +msgid "'''" +msgstr "'''" + +#. type: Title == +#: documentation/content/en/articles/leap-seconds/_index.adoc:43 +#, no-wrap +msgid "Introduction" +msgstr "Introductie" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:47 +msgid "" +"A _leap second_ is an one second adjustment made at specific times of year " +"to UTC to synchronize atomic time scales with variations in the rotation of " +"the Earth. This article describes how FreeBSD interacts with leap seconds." +msgstr "" +"Een _schrikkelseconde_ is een aanpassing aan UTC van één seconde op " +"specifieke tijden in het jaar om atomaire tijdschalen met variaties in de " +"aardrotatie te synchroniseren. Dit artikel beschrijft hoe FreeBSD omgaat met " +"schrikkelseconden." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:50 +msgid "" +"As of this writing, the next leap second will occur at 2015-Jun-30 23:59:60 " +"UTC. This leap second will occur during a business day for North and South " +"America and the Asia/Pacific region." +msgstr "" +"Op het moment van schrijven zal de volgende schrikkelseconde plaatsvinden op " +"30 juni 2015 om 23:59:60 UTC. Deze schrikkelseconde zal plaatsvinden op een " +"werkdag voor Noord- en Zuid-Amerika en het Aziatische/Pacifische gebied." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:52 +msgid "" +"Leap seconds are announced by https://www.iers.org/IERS/EN/Home/home_node." +"html[IERS] on https://datacenter.iers.org/data/latestVersion/16_BULLETIN_C16." +"txt[Bulletin C]." +msgstr "" +"Schrikkelseconden worden aangekondigd door https://www.iers.org/IERS/EN/Home/" +"home_node.html[IERS] op https://datacenter.iers.org/data/latestVersion/" +"16_BULLETIN_C16.txt[Bulletin C]." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:55 +msgid "" +"Standard leap second behavior is described in https://datatracker.ietf.org/" +"doc/html/rfc7164#section-3[RFC 7164]. Also see man:time2posix[3]." +msgstr "" +"Standaardgedrag voor schrikkelseconden is beschreven in https://datatracker." +"ietf.org/doc/html/rfc7164#section-3[RFC 7164]. Zie ook man:time2posix[3]." + +#. type: Title == +#: documentation/content/en/articles/leap-seconds/_index.adoc:57 +#, no-wrap +msgid "Default Leap Second Handling on FreeBSD" +msgstr "De standaardomgang met schrikkelseconden op FreeBSD" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:62 +msgid "" +"The easiest way to handle leap seconds is with the POSIX time rules FreeBSD " +"uses by default, combined with extref:{handbook}[NTP, network-ntp]. When " +"man:ntpd[8] is running and the time is synchronized with upstream NTP " +"servers that handle leap seconds correctly, the leap second will cause the " +"system time to automatically repeat the last second of the day. No other " +"adjustments are necessary." +msgstr "" +"De eenvoudigste manier om met schrikkelseconden om te gaan is met de " +"tijdregels van POSIX die FreeBSD standaard gebruikt, gecombineerd met " +"extref:{handbook}[NTP, network-ntp]. Wanneer man:ntpd[8] draait en de tijd " +"is gesynchroniseerd met bovenliggende NTP-servers welke correct met " +"schrikkelseconden omgaan, dan zal de schrikkelseconde ervoor zorgen dat het " +"systeem automatisch de laatste seconde van de dag herhaalt. Er zijn geen " +"verdere aanpassingen nodig." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:64 +msgid "" +"If the upstream NTP servers do not handle leap seconds correctly, man:" +"ntpd[8] will step the time by one second after the errant upstream server " +"has noticed and stepped itself." +msgstr "" +"Als de bovenliggende NTP-servers onjuist met schrikkelseconden omgaan, zal " +"man:ntpd[8] de tijd met één seconde vooruitzetten nadat de afdwalende " +"bovenliggende server het heeft opgemerkt en zichzelf heeft aangepast." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:66 +msgid "" +"If NTP is not being used, manual adjustment of the system clock will be " +"required after the leap second has passed." +msgstr "" +"Wanneer NTP niet wordt gebruikt zijn handmatige aanpassingen van de " +"systeemklok nodig nadat de schrikkelseconde heeft plaatsgevonden." + +#. type: Title == +#: documentation/content/en/articles/leap-seconds/_index.adoc:68 +#, no-wrap +msgid "Cautions" +msgstr "Waarschuwingen" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:72 +msgid "" +"Leap seconds are inserted at the same instant all over the world: UTC " +"midnight. In Japan that is mid-morning, in the Pacific mid-day, in the " +"Americas late afternoon, and in Europe at night." +msgstr "" +"Schrikkelseconden worden wereldwijd op hetzelfde moment ingevoegd: " +"middernacht UTC. In Japan is dat het midden van de ochtend, in het Pacifisch " +"gebied in de middag, in Amerika in de late middag en in Europa in de nacht." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:74 +msgid "" +"We believe and expect that FreeBSD, if provided correct and stable NTP " +"service, will work as designed during this leap second, as it did during the " +"previous ones." +msgstr "" +"We verwachten dat FreeBSD, mits voorzien van een correcte en stabiele NTP-" +"dienst, zal werken zoals verwacht tijdens deze schrikkelseconde, net zoals " +"het bij de vorige deed." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:77 +msgid "" +"However, we caution that practically no applications have ever asked the " +"kernel about leap seconds. Our experience is that, as designed, leap " +"seconds are essentially a replay of the second before the leap second, and " +"this is a surprise to most application programmers." +msgstr "" +"We waarschuwen echter dat praktisch geen enkele toepassing de kernel ooit om " +"schrikkelseconden heeft gevraagd. Onze verwachting is dat, zoals ontworpen, " +"schrikkelseconden in feite een herhaling zijn van de seconde voor de " +"schrikkelseconde, wat een verassing is voor de meeste " +"toepassingsprogrammeurs." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:79 +msgid "" +"Other operating systems and other computers may or may not handle the leap-" +"second the same way as FreeBSD, and systems without correct and stable NTP " +"service will not know anything about leap seconds at all." +msgstr "" +"Andere besturingssystemen en andere computers kunnen anders met de " +"schrikkelseconde omgaan dan FreeBSD, en systemen zonder een correcte en " +"stabiele NTP-dienst zullen helemaal niks van schrikkelseconden afweten." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:81 +msgid "" +"It is not unheard of for computers to crash because of leap seconds, and " +"experience has shown that a large fraction of all public NTP servers might " +"handle and announce the leap second incorrectly." +msgstr "" +"Het komt voor dat computers crashen vanwege schrikkelseconden, en ervaring " +"laat zien dat een groot gedeelte van alle publieke NTP-servers de " +"schrikkelseconde onjuist kunnen aankondigen en afhandelen." + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:83 +msgid "" +"Please try to make sure nothing horrible happens because of the leap second." +msgstr "" +"Probeer er alstublieft voor te zorgen dat er niks ergs gebeurt vanwege de " +"schrikkelseconde." + +#. type: Title == +#: documentation/content/en/articles/leap-seconds/_index.adoc:85 +#, no-wrap +msgid "Testing" +msgstr "Testen" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:91 +msgid "" +"It is possible to test whether a leap second will be used. Due to the " +"nature of NTP, the test might work up to 24 hours before the leap second. " +"Some major reference clock sources only announce leap seconds one hour ahead " +"of the event. Query the NTP daemon:" +msgstr "" +"Het is mogelijk om te kijken of een schrikkelseconde zal worden gebruikt. " +"Vanwege de aard van NTP kan de test tot 24 uur voor de schrikkelseconde " +"werken. Sommige grote bronnen van referentieklokken kondigen " +"schrikkelseconden slechts één uur van te voren aan. Ondervraag het NTP-" +"daemon:" + +#. type: delimited block . 4 +#: documentation/content/en/articles/leap-seconds/_index.adoc:95 +#, no-wrap +msgid "% ntpq -c 'rv 0 leap'\n" +msgstr "% ntpq -c 'rv 0 leap'\n" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:99 +msgid "" +"Output that includes `leap_add_sec` indicates proper support of the leap " +"second. Before the 24 hours leading up to the leap second, or after the " +"leap second has passed, `leap_none` will be shown." +msgstr "" +"Uitvoer welke `leap_add_sec` bevat wijst op correcte ondersteuning van de " +"schrikkelseconde. Voorafgaand aan de 24 uur die tot de schrikkelseconde " +"leiden, of nadat de schrikkelseconde is verstreken, zal `leap_none` " +"zichtbaar zijn." + +#. type: Title == +#: documentation/content/en/articles/leap-seconds/_index.adoc:101 +#, no-wrap +msgid "Conclusion" +msgstr "Conclusie" + +#. type: Plain text +#: documentation/content/en/articles/leap-seconds/_index.adoc:104 +msgid "" +"In practice, leap seconds are usually not a problem on FreeBSD. We hope " +"that this overview helps clarify what to expect and how to make the leap " +"second event proceed more smoothly." +msgstr "" +"In de praktijk zijn schrikkelseconden meestal geen probleem op FreeBSD. We " +"hopen dat dit overzicht helpt met wat te verwachten en hoe schrikkelseconden " +"soepeler te laten verlopen." From nobody Thu Jun 26 02:18:19 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bSMmX0HsMz5ysG4 for ; Thu, 26 Jun 2025 02:18: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSMmW6dZfz3mpT; Thu, 26 Jun 2025 02:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750904299; 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=vFaoSFSpKl0X5HOTu/Edx8x+hrX4rI2QpHxGT1RMAdE=; b=B3PAepJA5DhwPedNaxjxnfYwWcHd42yVMogCsNrRoaEiXoyBBmrKwxwagpqICy1KVLlSTj gPfkY5u6X5CkVo1Y8gkwJyZXMtHSSz8bn+Ca2Ah/efTWSzE/DWy/d3y0YqrXVXjR8kTqWw k2Gwh15QnK13dwGYg/E+TUdE+ds/7ygYdVWBorcLyOOXpGVEDUAjEn+RGwap9OC1RtnfmE T9sdMZq3QqCu0L430e07ZfeDFU8hc2A7JBJSgBUs8v9FiHahJVf1W43htcqerILcOLMZXb 88AKJn+1VNBjw51hD3S8tVOYs7XgfWzD1+JoW8wiCZGpJ1jkvv9JHPpo3RJTKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750904299; 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=vFaoSFSpKl0X5HOTu/Edx8x+hrX4rI2QpHxGT1RMAdE=; b=KvPKxXR4sMX2mwtd1x44sEhpj44WB5BqZYap9KTRDVKjqZWdyEUVCujPyDI0EXO0fpUxJ/ vCt1uw+5BH3/tNw/0wowet8OQa+te+5pMGK0S5JWgtiOjBp9SAO9pjZnrBz2z6LqeLDp0R nvdBD+rOxZxq8UTVUihIWUj0HeLdkIyD6MyinxP3OOkLujHJ2nTvg15wumz5mVab1A+cBG xRetXrrGbAh1YocF24k/uBG1nLPCmO9BI0AYxGpwtlkzor/WCvxdYpZOWd//w/AiecVwHB uWWmaZC6Hd4PRIodxhOQg00cxroiFHjdMPADj49xwuyxplOwjwRwAkmIAT0qsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750904299; a=rsa-sha256; cv=none; b=N//VASQzgRHzg15gc8Dmfgzq+PzTOgU03CBiEkuShcLlwlHCFxFGUDSiC4VTauyz+NasqK cC8Rkla0mBZzpqx44BlB7q5mtNc8xUCa3nkrCa+mHSVTcergjl0DhtNEdh8+/5aCwxqwXz qI+3xBujDdwFNC7UgSMwMlcp/+B82gNdOJK0RkGQjCa6QwFw45Ca31LRKWJB4uMiTfaQF8 Q+WMBS8eX0/fvSqB+eX5xxiFWuHyH1ryKRf327NbXJrrOzQZsF+hkdNVbEnakrLt+mUkOf U0wnrdeqQEv2XFnaL+pXNFjIp1Mm6Jk7MbEQKkE/7zLT2RY6qp+TgnZlyb0Txw== 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 4bSMmW6CPtzkD4; Thu, 26 Jun 2025 02:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55Q2IJ2F078277; Thu, 26 Jun 2025 02:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55Q2IJoP078274; Thu, 26 Jun 2025 02:18:19 GMT (envelope-from git) Date: Thu, 26 Jun 2025 02:18:19 GMT Message-Id: <202506260218.55Q2IJoP078274@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alexander Ziaee Subject: git: 5d7d057bb4 - main - handbook/network: Clarify use of Amnesiac List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d7d057bb4c6cf7ff931fa6d57fb8f6810cec1a3 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/doc/commit/?id=5d7d057bb4c6cf7ff931fa6d57fb8f6810cec1a3 commit 5d7d057bb4c6cf7ff931fa6d57fb8f6810cec1a3 Author: Alexander Ziaee AuthorDate: 2025-06-26 02:03:19 +0000 Commit: Alexander Ziaee CommitDate: 2025-06-26 02:03:19 +0000 handbook/network: Clarify use of Amnesiac When FreeBSD calls itself Amnesiac, that is not actually the hostname. It does that when there is no hostname set. It is not a substitute for assigning a hostname. Setting a hostname or complaining when none is set would introduce a regression for cases where the hostname is assigned by the DHCP server. Attempt to clarify the handbook instead of changing the behavior. PR: 286847 Reported by: jrtc27 Discussed with: linimon --- documentation/content/en/books/handbook/network/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/handbook/network/_index.adoc b/documentation/content/en/books/handbook/network/_index.adoc index 875e9fa7cf..fdd096d763 100644 --- a/documentation/content/en/books/handbook/network/_index.adoc +++ b/documentation/content/en/books/handbook/network/_index.adoc @@ -774,7 +774,7 @@ The hostname represents the fully qualified domain name (FQDN) of the host on th [TIP] ==== -If no hostname has been set for the host FreeBSD will assign the value `Amnesiac`. +If no hostname is set for the host, FreeBSD will call itself `Amnesiac`. ==== [[get-hostname]] From nobody Thu Jun 26 06:37:47 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bSTWv61qJz608Ks for ; Thu, 26 Jun 2025 06:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSTWv51M0z3lS4; Thu, 26 Jun 2025 06:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750919867; 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=JxG9EzD0dQTNPKJoUT2jwi5nGhuwCwe3ym1/xmyTkHo=; b=jG7+CLxJ6m9Rcc0ODPTxvNO2NhU3X0s3G5o4I+gLJCguKDxesOAYYRyZCpW8vzIy/suV3S i4tOB4AFdI3QU/2xCboa3R2PZ3JedZrCMtQZ7FWeoxHSrpqVca44fBKTaAScnVPbi40eLB yim5XY3CDP10N70c/iD98dQ/Of0kZvt7sfQbzAx0PpdYgV6Iu5rdw17G3Ngd7K+LRvgtEu VfvnTyLGorgKm22r9nphUZDixpjoNOp961a4hZCmC29bIsgYsGVLGrbmrHYwp9hsX1+gT7 VmUFD+V6IPYjYMvTKX0ZBx2J6mXsKSLQgRJ96G7PIYGyYSAVHDUDoVOxJohrlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750919867; 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=JxG9EzD0dQTNPKJoUT2jwi5nGhuwCwe3ym1/xmyTkHo=; b=Enk5hHPlNaSDOgUyGPFxWF0q2TzPsPGQHRRH9dURDO/bRt+gjUq5VPGKwT2jnh8o1ca1yf LeeDWMZUzzIpt4Q/Da2W1/jiDQb5GdYVMIYZ9U9CNw7oGNOGydiP0Cijfj49+4c+Ccos8q 8aZ38o0DIMEoO9AhjX8W7LBAO1OFkmyoy0h41VvtFox9kxD23+DvdCCJmIUgMi5nv0hsHi vGKfMRYUVo9ZP44e8WGt4arxzuwmQeegFQ1IV9Ro64y0WZliZqWkTtoGX2SD2WQtTJJzYC VMdVxAgkSyZB1E/yXD2exUNm550gK4AhIbqS6Bg7M789KhMDUTgZ6XKmt537gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750919867; a=rsa-sha256; cv=none; b=NPmry4AsXpU1HccTS5RWgoFZkKSvnuZ6b9R+KY4+BbsSac+mycgq1BaJC56llwcdouFDr3 pmkY/WSkAbMX7gYuTX3Gkkwze407viDcZ+SYazC0pH9pCOl5ttjb+TdvchwkGwxP7hxkyB lmxWPd5XTMv4rPHpG8M9wiyqq43//YiAexLrVr/oDTFqp4TJEw6mPBBIf3RHhK7sxwjXbE SCtFqHS3jkUKupBnBKwiKzCvVMLNE9u1nJYdO1W9Vj99tT6psdChcl1ye8JaATXdYw2Hkc iqYM2FQoM2/pMbBZO+s0P3UuZn9J3hmA/VU+heFeEQXYtn4RJA75IK6CLoxv5A== 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 4bSTWv4RCHzsCv; Thu, 26 Jun 2025 06:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55Q6bl95067085; Thu, 26 Jun 2025 06:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55Q6blRc067082; Thu, 26 Jun 2025 06:37:47 GMT (envelope-from git) Date: Thu, 26 Jun 2025 06:37:47 GMT Message-Id: <202506260637.55Q6blRc067082@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 47753e1a79 - main - Fix hu PDF handbook generation List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org 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: 47753e1a79464f4290f1b791446fc201bde40e0d Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=47753e1a79464f4290f1b791446fc201bde40e0d commit 47753e1a79464f4290f1b791446fc201bde40e0d Author: Fernando Apesteguía AuthorDate: 2025-06-26 06:36:53 +0000 Commit: Fernando Apesteguía CommitDate: 2025-06-26 06:37:31 +0000 Fix hu PDF handbook generation --- documentation/content/hu/books/handbook/install/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/hu/books/handbook/install/_index.adoc b/documentation/content/hu/books/handbook/install/_index.adoc index bbcade59ce..a4595031b7 100644 --- a/documentation/content/hu/books/handbook/install/_index.adoc +++ b/documentation/content/hu/books/handbook/install/_index.adoc @@ -906,7 +906,7 @@ Bizonyos alkalmazások kedvelnek egyes partíciókiosztási sémákat, különö Ebben a sémában négy partíció szerepel - egy a lapozóállománynak és három az állományrendszereknek. .Az elsõ lemez partícióinak kiosztása -[cols="1,1,1,1", frame="none", options="header"] +[cols="10%,10%,10%,70%", frame="none", options="header"] |=== | Partíció | Állományrendszer @@ -947,7 +947,7 @@ Az imént megadott értékeket csak példaként adtuk meg és csak a tapasztalt Ha a FreeBSD-t egynél több lemezre telepítjük, akkor a korábban megadott többi slice-ban is létre kell hoznunk partíciókat. Ezt legegyszerûbben úgy tehetjük meg, ha minden lemezen létrehozunk két partíciót: egyet a lapozóállománynak, egyet pedig az állományrendszernek. .Több lemez partícióinak kiosztása -[cols="1,1,1,1", frame="none", options="header"] +[cols="10%,10%,10%,70%", frame="none", options="header"] |=== | Partíció | Állományrendszer From nobody Sat Jun 28 08:14:46 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bTlZv2lW8z5yhFv for ; Sat, 28 Jun 2025 08:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bTlZt460rz3nQb; Sat, 28 Jun 2025 08:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751098486; 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=rbkFSGVc4pFtZESZauOweiUVqlqK89Xf9c3mL03ov8I=; b=IypJK2sSwLI+OUxd1WSdgAPt7qqriRbvETrdwP/S5gX8/ZZYE1cGfpMTNMS0tf351MoavO xjaxwjKDJyRaLsYvq6c+Ls49QttG6OLZIp9eMk4E99uAjBJGxt9ZWCONZBWtvrQgP4w2bg LbJrks3RxwlMxL2mwhN7K9s/V3p+WykjqM4ofQCOX4Y27VlpwwChKZmsZ2ewZTlK1UC+iK 2F0hlAU970B6uvHyBpBIj41cRHaTYkkUEVJv1cQukmynnK2zAxB/5CQvARsDIsSZav6QHg /A3fZQiSB3Af9TfaGDvX6fxJu4zJHf+eaVEcNb4aQkV8NOMKl3V1OjvNcpQr1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751098486; 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=rbkFSGVc4pFtZESZauOweiUVqlqK89Xf9c3mL03ov8I=; b=HFHDAV58jGbN3OVheISG9h7HABQEzuDiVGHfSOTikEKimgAM67+uLMbh/vmLe0EMo//y3l H8yvcJSlVStWQt4bsuvvwxgbaLfIKnF/yD16dqowly+hA1Tqt340hubFUwKddjFEC+Zj9i nof7hhbeVo9kQfBEz5H4/+zewsNJgM9ArwawRmSqzluSvyfFQ22CUfVBDgYPyd9fdKdjRY eqghxu3R3m6gkLqe3upbK8dTdWFZ4B3h5mDK59115tg1ySthXWXJ+CMsSmT9DZ+mubCP3u AJug5WIAyfqPKia8tXsi2XYXOF0Uzgr3jbZMS/Mpp5aw/1TJAEYdUsFQWsFNrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751098486; a=rsa-sha256; cv=none; b=aWD3EnO/uuoYxLC+JVsKX6yK78oTIyP2/GphJJcXROKpNTVHymLwy2YYXFO5RAwFVig/c9 CfvBROPfAb9EyL45En7FlJAEAAzflC483I9vNXDNYeqHbUC2x8/6WQaaiMNZXGUqgP0obR HYLWrQb2i73IxJTzi+BpV+arg/AsOBC5b8QvwM+R/nTQPRdviBKwYftaz5GkDzUnk+NVS6 KAzS0kbQb7qXj6jyStNpW9llENXDs2TM8d4C2Eudr8dImxs0KCTIAwfXy1Y9ZbysLATZ6b NRySzALBAiuytgap230VEh+P4OWdfmBgev5S0RXSVwfzBZMyBQXbHbZJl8QOXA== 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 4bTlZt3RKyz9Xt; Sat, 28 Jun 2025 08:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55S8EkEo066734; Sat, 28 Jun 2025 08:14:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55S8EkaE066731; Sat, 28 Jun 2025 08:14:46 GMT (envelope-from git) Date: Sat, 28 Jun 2025 08:14:46 GMT Message-Id: <202506280814.55S8EkaE066731@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: 631bd25dfb - main - The use of ' as a package separator is now officially deprecated in Perl 5.40 List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 631bd25dfb42c2bcea096b6fa8ce66b3e9c896aa Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=631bd25dfb42c2bcea096b6fa8ce66b3e9c896aa commit 631bd25dfb42c2bcea096b6fa8ce66b3e9c896aa Author: Wolfram Schneider AuthorDate: 2025-06-28 08:13:32 +0000 Commit: Wolfram Schneider CommitDate: 2025-06-28 08:13:32 +0000 The use of ' as a package separator is now officially deprecated in Perl 5.40 --- website/content/en/cgi/man.cgi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index e5769b2b90..ca471806cf 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1369,7 +1369,7 @@ $want_to_link_to_this_page = 1; # CGI Interface -- runs at load time &do_man( &env('SCRIPT_NAME'), &env('PATH_INFO'), &env('QUERY_STRING') ) - unless defined($main'plexus_configured); + unless defined($main::plexus_configured); # # end of config @@ -1607,15 +1607,15 @@ sub http_header { print qq{Content-disposition: inline; filename="$filename"\n} if $filename; - if ( defined($main'plexus_configured) ) { - &main'MIME_header( 'ok', $content_type ); + if ( defined($main::plexus_configured) ) { + &main::MIME_header( 'ok', $content_type ); } else { print "Content-type: $content_type\n\n"; } } -sub env { defined( $main'ENV{ $_[0] } ) ? $main'ENV{ $_[0] } : undef; } +sub env { defined( $main::ENV{ $_[0] } ) ? $main::ENV{ $_[0] } : undef; } sub apropos { local ($query, $sektion) = @_; @@ -2098,7 +2098,7 @@ sub dec { # # Splits up a query request, returns an array of items. -# usage: @items = &main'splitquery($query); +# usage: @items = &main::splitquery($query); # sub splitquery { local ($query) = @_; @@ -2566,13 +2566,13 @@ $head } sub secure_env { - $main'ENV{'PATH'} = '/bin:/usr/bin'; - $main'ENV{'MANPATH'} = $manPath{$manPathDefault}; - $main'ENV{'IFS'} = " \t\n"; - $main'ENV{'PAGER'} = 'cat'; - $main'ENV{'SHELL'} = '/bin/sh'; - $main'ENV{'LANG'} = 'C'; - undef $main'ENV{'DISPLAY'}; + $main::ENV{'PATH'} = '/bin:/usr/bin'; + $main::ENV{'MANPATH'} = $manPath{$manPathDefault}; + $main::ENV{'IFS'} = " \t\n"; + $main::ENV{'PAGER'} = 'cat'; + $main::ENV{'SHELL'} = '/bin/sh'; + $main::ENV{'LANG'} = 'C'; + undef $main::ENV{'DISPLAY'}; } sub include_output { From nobody Sat Jun 28 09:10:31 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bTmqC6nQlz5ykqQ for ; Sat, 28 Jun 2025 09:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bTmqC553sz3Gl0; Sat, 28 Jun 2025 09:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751101831; 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=GUgk77FlGu/Kgn3a98wbTMvs1jskmSNYVU5A6u3GnwM=; b=R7W3f25swx9FbhpxI095CeZRalh2+K7gP6eA5W8Et913B0mzuzs4No6CAFYNUFguNJFtmI iHg5rVT8PMWo7tNGf8cNoHINiUuaXYQBnbdy1hkQhYbYUgdvT6W/ddYfQRfCUEFujPiAMq PoUAtwCDsq0yImfa6sNkvVjfY+oiePBnOWvdb6J+o5qRDxgrOWn0cvFP4bxIAvnSCdDwaJ g1Ix93zG5TYvBsNmuCA1tUYAngRqpAjhVZKBCY79me+4SkdcxiPIZ0rSIOAiglr7EYS1Y7 mYT7XTkAnnX1YmieDrNCZQz8xQCQIYfr0FH4TXn05h3Lt6/BIy8bRXeJbj+F/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751101831; 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=GUgk77FlGu/Kgn3a98wbTMvs1jskmSNYVU5A6u3GnwM=; b=JHKQ3KfaPDhMi5KnzfjChMcFiurLgffcoOEMFxEpfFKcYQiCK5/YOwt1ucm+TQmCdOSCD/ G8bjupTCWvjWfdSVDhSNffr+y84vEZXA+JshzhlvBWT70T1ku+pORFLj1MYwhOQJhOR88e MKGSG1H/7fAIJLJ61c/dme8jjOf7s+U2i/xXp0LGQIRgXSpHOnyf1E4P4LejkwEIC1FdRf A7fOWHwLOKNrDAzWpdHhVlOE58uSU/eMvrPrApL5wa/J2t9hkgRW5UvLCZrd/240Xz/jiV LUKQIwtXNsPREVJmIOw8UWQyTiJzaZ47TojCBVj8KLoJ1iN13mL/5ZJi8toMSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751101831; a=rsa-sha256; cv=none; b=JblyW30LYScmDjrPweUPLlOrxQ2WHjTl/a+zZveRbk3ezHzROLhVPh2dqGsEjYwgisTnkS 6qHsGwukjCoW4YW76w3ke3FZk1YcDHZyXAILQY/NGHdu5nn7zO5cVDxOjiQcricXxGUScT n9hCHiKkI5LvhHiIXiN+4IbONyOW0EBIJgtYXpVuwSNheiKQF60ZCFduUVI47dlcogi1l1 AVejfxBXvFowCxBMhKCvjDmORWQVP+OFaDxIo9rDQAJQT6MeIGv0c7VbUAfZAT+RWaGTNA wDwsQi+L/wGQsZIyK+UKBpCj7yZYQrn1Qms7QGVD9Yu82EsHG8DajE3hHB4UZw== 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 4bTmqC4DHZzBjr; Sat, 28 Jun 2025 09:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55S9AVK1071486; Sat, 28 Jun 2025 09:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55S9AVHf071483; Sat, 28 Jun 2025 09:10:31 GMT (envelope-from git) Date: Sat, 28 Jun 2025 09:10:31 GMT Message-Id: <202506280910.55S9AVHf071483@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: e2b13a9fda - main - add Rocky Linux 9.6 & 10.0 manual pages List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2b13a9fdacf7c3c05c5339c4694cd446247faa0 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=e2b13a9fdacf7c3c05c5339c4694cd446247faa0 commit e2b13a9fdacf7c3c05c5339c4694cd446247faa0 Author: Wolfram Schneider AuthorDate: 2025-06-28 09:09:41 +0000 Commit: Wolfram Schneider CommitDate: 2025-06-28 09:09:41 +0000 add Rocky Linux 9.6 & 10.0 manual pages --- website/content/en/cgi/man.cgi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index ca471806cf..7783a722a7 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -269,6 +269,8 @@ $sectionpath = { 'CentOS 7.8' => { 'path' => '0p:1:1p:2:3:3p:3t:4:5:6:7:8:9:n' }, 'CentOS 7.9' => { 'path' => '0p:1:1p:2:3:3p:3t:4:5:6:7:8:9:n' }, + 'Rocky 10.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n', }, + 'Rocky 9.6' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n', }, 'Rocky 9.5' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n', }, 'Rocky 9.4' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n', }, 'Rocky 9.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n', }, @@ -861,6 +863,8 @@ $manPathDefault = 'FreeBSD 14.3-RELEASE and Ports'; 'CentOS 7.8', "$manLocalDir/CentOS-7.8", 'CentOS 7.9', "$manLocalDir/CentOS-7.9", + 'Rocky 10.0', "$manLocalDir/Rocky-10.0", + 'Rocky 9.6', "$manLocalDir/Rocky-9.6", 'Rocky 9.5', "$manLocalDir/Rocky-9.5", 'Rocky 9.4', "$manLocalDir/Rocky-9.4", 'Rocky 9.3', "$manLocalDir/Rocky-9.3", @@ -1217,7 +1221,7 @@ while ( ( $key, $val ) = each %manPath ) { 'ubuntu', 'Ubuntu 24.04 noble', 'dragonfly', 'DragonFly 6.4.0', 'centos', 'CentOS 7.9', - 'rocky', 'Rocky 9.5', + 'rocky', 'Rocky 10.0', 'linux', 'Debian 12.11.0', 'darwin', 'Darwin 8.0.1/ppc', 'opendarwin', 'OpenDarwin 7.2.1', From nobody Sat Jun 28 20:48:05 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bV4J629Vhz60SvR for ; Sat, 28 Jun 2025 20:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bV4J60pfyz3ZCZ; Sat, 28 Jun 2025 20:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751143686; 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=0nETCKZIm5grSr+lZdFNBjPc9wRhM9JdKqtSHobXJZw=; b=Ywt1D+174O1urowzd1k7bDiYdZ2Oxtti6fpusPwLvH/ethkTRhJGI/kGDc69xVQ+l+ByZc Nsm/RC3O1pIIbvldj6Pih+ejZfqD3nCsRDuvm4+tLMuMD1C5Ammvx5CbgIaOxtpyZ/ol8w VxgYGxNtmyVi1iVu/b+SxkOmjARNqQiItDcKsoOhzWjkaJ5nKs8+z0VhMVXAbcu9lQo3MX iStJkw629FEiNa8VJJoLWer7dJR1iUA1xYlOmQBcd3WomtQxA3Rt5lZoDwSMRR/Wep6R4T Hvj+xlDhRvkmPLZ/wbptfh54qGa/GwrXXRFNPrkCzQRtdCVm5J235MYcLDOJsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751143686; 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=0nETCKZIm5grSr+lZdFNBjPc9wRhM9JdKqtSHobXJZw=; b=O/FxzamX/8vR2KqvyeiGhmxpTw2GnAiwncqFKZisCUURw7tZqvYquZwnlEZwW5rAcV/H0c hD8xpyIAY6Z/gwPuDoNEXXqGTGAzgphu9a/nOWHE0g9O9D1hUG78Wn6uT/UFj4pe9DsrRw hPZq+R88pZZ4Y5CiWRrQaonrWh7ymyDveykh8hdK+QD8ADuCMA35rrr72DX+IjsA25nhtZ sl2lbDkinYJm6WXqLuHPLRbAkSbaQ97EG3MMgTffGC1Ce/NWo1RKAn8Vd9LFEEeUciIudy hRdFeDYHzFacG2UbNlEB4ca4+hbjURtDXU3WqM70h+uOCKm01mIxtIYPYGkOrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751143686; a=rsa-sha256; cv=none; b=PTuVZV+scI+pZDzBhmnF+6MV+juLKrkWBeTn6VIqd82/O+R6Zu8AZ5QgNO9b1B1+6GUOWc Ge0GOhwfBnM6u95ZEMfPhuQaZM41g2NvAjdQsWvRnrmdbDn/ipe+P7OeeGjtCQ1BMYhTqT aL2iTGius8/Y+2oXa7kcHW+e/pA+inc0RAO8nTuIC93nx3bJvpUj9yyTrJREJd4JzGFML6 H+tWzX5ssUGkok3zEGnOOY2kMDnfRkOBClXSqRZDpEC8uC/1As1EYA6J0wOCT+9MC5ty1I IoUGXLJus7oejhGPYFpb37NVHLbkf7n5+jA7pPY6h4Gxi120H4jpsrINOouwGA== 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 4bV4J56gFTzqL9; Sat, 28 Jun 2025 20:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55SKm59r072915; Sat, 28 Jun 2025 20:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55SKm5C6072912; Sat, 28 Jun 2025 20:48:05 GMT (envelope-from git) Date: Sat, 28 Jun 2025 20:48:05 GMT Message-Id: <202506282048.55SKm5C6072912@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Jason Helfman Subject: git: 4491e8fac1 - main - handbook/porters-handbook: add new ports category 'filesystems' List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jgh X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4491e8fac19d6928fbadf4cd13ce31ba411bdf22 Auto-Submitted: auto-generated The branch main has been updated by jgh: URL: https://cgit.FreeBSD.org/doc/commit/?id=4491e8fac19d6928fbadf4cd13ce31ba411bdf22 commit 4491e8fac19d6928fbadf4cd13ce31ba411bdf22 Author: Jason Helfman AuthorDate: 2025-06-28 20:44:24 +0000 Commit: Jason Helfman CommitDate: 2025-06-28 20:47:00 +0000 handbook/porters-handbook: add new ports category 'filesystems' PR: 282965 Reported by: Herbert J. Skuhra --- documentation/content/en/books/porters-handbook/makefiles/_index.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index 657dad7dd8..243328727a 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -735,6 +735,10 @@ For non-virtual categories, there is a one-line description in `COMMENT` in that |Ports related to the Enlightenment window manager. | +|[.filename]#filesystems# +|File systems and related utilities. +| + |[.filename]#finance# |Monetary, financial and related applications. | From nobody Sun Jun 29 20:28:16 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bVgpn3zzsz60f79 for ; Sun, 29 Jun 2025 20:28:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bVgpn3c20z46hS; Sun, 29 Jun 2025 20:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751228897; 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=A58/QTgP5y02krHks54xn48nCw4w8R5CyX8SDeMXvIQ=; b=lOZvuIl/Lu00PeiX7pO2YENmgJvoloE3gx55YWihBPnvy3z+JdXCrA28AOZyKoXzrsdztM vf9jOKgZ3RWEJE0i21ClmKi8PxBM6tB6v6SbIeiuz/VnkhHnW3c7w30GsQDaskceQNLPC9 QI7vFxe6ocIMFVL/iZWdLU0jxQYxMT4E5DTkVlSmlvf28mYEIfa17Y/BNu0GmraD2lKdSo D/sawxW0YbbWCPfzlca/pzb45tJ1OTSHX/G8IeOoviB2DiuAP+5UBovd7cv+theHvFchDn EI74RSeyUtsf7VgCqA64FoNrr4PCIovSt+rvzqJr213+lYuVDg977DSYh+ecjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751228897; 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=A58/QTgP5y02krHks54xn48nCw4w8R5CyX8SDeMXvIQ=; b=dJbmJ9shLKBp8Pl7X92IugNHdgIp46oN/Dno6zCNvdsFMogMTkuOIec6nib+dJGyDiz3XG xUNQAb0QOIWfe6BLfkf3YCKaVDzXx81BYWM8wsydHpBzED7ionX1htRcRKuo5ZH3Q+AzW2 pZ95EYRrx+Nah1d6yLFgZ7fUVIR2zgM0Gr+WPAina572Nl+btg3KJq6OpZYF1CXXII8hze tfe+b2NYRvwxM8pbPiLIX8n42L6eLy2rvz7aGeRwfG5YfqLhubYPjEkvF/JoIbbv2dpo4b XOVpn9laUEB0gD5MFBrPuzYHUjmJfNwbCZx8o00tzfAMPV4IdOoDVO95ARvXiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751228897; a=rsa-sha256; cv=none; b=lvYs8BkHqY+29F+KtdHvKc8Qyjb5gh+ACd6aejfJCCyPWlbAP2LluBV9k/NO/9T2g26ANH Fuhu1WGf/2euemslXlO7uhpeF12IvAb2RP//PhJchAz9C4QDeG4Db4Nqd3sv8AMopUqzxV +D3yWMNvo2mSeBb51aYO6TLxDBUiy3a87WM2RaQ1HZmgQ5RwxRjuakcoo8cQ8/rOpNnkpw kS95c0qkWIlTwjnkN1pbw0zKCUyOVXUek3kZDdracHFrY7/0YpTM/zTcbn3gAxUe9+4NS7 BVOJto0q5//UJwv0q3OiEYgTJzEteMoT4vhatS5q/gkslMMZ8EHWi0A/RDEb3A== 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 4bVgpn395vzb4W; Sun, 29 Jun 2025 20:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55TKSHdK044564; Sun, 29 Jun 2025 20:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55TKSGvX044560; Sun, 29 Jun 2025 20:28:16 GMT (envelope-from git) Date: Sun, 29 Jun 2025 20:28:16 GMT Message-Id: <202506292028.55TKSGvX044560@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Edson Brandi Subject: git: 5d7bdaf4d5 - main - doc: Update source files (en .po), for translations List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ebrandi X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d7bdaf4d53f27f6c9c3abdd63b67e21949f294b Auto-Submitted: auto-generated The branch main has been updated by ebrandi: URL: https://cgit.FreeBSD.org/doc/commit/?id=5d7bdaf4d53f27f6c9c3abdd63b67e21949f294b commit 5d7bdaf4d53f27f6c9c3abdd63b67e21949f294b Author: Edson Brandi AuthorDate: 2025-06-29 20:26:22 +0000 Commit: Edson Brandi CommitDate: 2025-06-29 20:26:22 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 1567 +-- .../content/en/articles/pgpkeys/_index.po | 732 +- .../content/en/articles/vm-design/_index.po | 318 +- .../developers-handbook/kerneldebug/_index.po | 60 +- .../books/developers-handbook/policies/_index.po | 4 +- .../en/books/developers-handbook/tools/_index.po | 5 +- documentation/content/en/books/faq/_index.po | 310 +- .../en/books/handbook/cutting-edge/_index.po | 4 +- .../content/en/books/handbook/firewalls/_index.po | 4 +- .../content/en/books/handbook/glossary.po | 199 +- .../content/en/books/handbook/introduction.po | 4 +- .../en/books/handbook/network-servers/_index.po | 591 +- .../content/en/books/handbook/network/_index.po | 508 +- .../content/en/books/handbook/wayland/_index.po | 4 +- .../content/en/books/handbook/x11/_index.po | 20 +- .../content/en/books/handbook/zfs/_index.po | 4 +- .../en/books/porters-handbook/makefiles/_index.po | 3314 +++--- .../en/books/porters-handbook/uses/_index.po | 2225 ++-- .../en/books/porters-handbook/versions/_index.po | 11659 ++++++++++--------- 19 files changed, 10744 insertions(+), 10788 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 1dee22ffb3..9585f882ca 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2025-05-01 19:56-0300\n" +"POT-Creation-Date: 2025-06-29 21:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -513,7 +513,7 @@ msgstr "" #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:247 #, no-wrap -msgid "core@" +msgid "srcmgr@" msgstr "" #. type: Table @@ -614,7 +614,7 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:271 msgid "" "Committers can acquire an additional bit by the usual process of finding a " -"mentor who will propose them to core, doceng, or portmgr, as appropriate. " +"mentor who will propose them to srcmgr, doceng, or portmgr, as appropriate. " "When approved, they will be added to 'access' and the normal mentoring " "period will ensue, which will involve a continuing of \"Approved by\" for " "some period." @@ -1320,7 +1320,7 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:580 -#: documentation/content/en/articles/committers-guide/_index.adoc:1737 +#: documentation/content/en/articles/committers-guide/_index.adoc:1744 #, no-wrap msgid " git checkout -b \n" msgstr "" @@ -2036,30 +2036,31 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:1582 #: documentation/content/en/articles/committers-guide/_index.adoc:1611 #: documentation/content/en/articles/committers-guide/_index.adoc:1627 -#: documentation/content/en/articles/committers-guide/_index.adoc:1660 -#: documentation/content/en/articles/committers-guide/_index.adoc:1681 -#: documentation/content/en/articles/committers-guide/_index.adoc:1712 -#: documentation/content/en/articles/committers-guide/_index.adoc:1724 -#: documentation/content/en/articles/committers-guide/_index.adoc:1755 +#: documentation/content/en/articles/committers-guide/_index.adoc:1638 +#: documentation/content/en/articles/committers-guide/_index.adoc:1667 +#: documentation/content/en/articles/committers-guide/_index.adoc:1688 +#: documentation/content/en/articles/committers-guide/_index.adoc:1719 +#: documentation/content/en/articles/committers-guide/_index.adoc:1731 #: documentation/content/en/articles/committers-guide/_index.adoc:1764 -#: documentation/content/en/articles/committers-guide/_index.adoc:1774 -#: documentation/content/en/articles/committers-guide/_index.adoc:1790 -#: documentation/content/en/articles/committers-guide/_index.adoc:1806 +#: documentation/content/en/articles/committers-guide/_index.adoc:1773 +#: documentation/content/en/articles/committers-guide/_index.adoc:1785 +#: documentation/content/en/articles/committers-guide/_index.adoc:1801 #: documentation/content/en/articles/committers-guide/_index.adoc:1817 -#: documentation/content/en/articles/committers-guide/_index.adoc:1824 -#: documentation/content/en/articles/committers-guide/_index.adoc:1837 -#: documentation/content/en/articles/committers-guide/_index.adoc:1857 -#: documentation/content/en/articles/committers-guide/_index.adoc:1871 -#: documentation/content/en/articles/committers-guide/_index.adoc:1887 -#: documentation/content/en/articles/committers-guide/_index.adoc:1899 +#: documentation/content/en/articles/committers-guide/_index.adoc:1828 +#: documentation/content/en/articles/committers-guide/_index.adoc:1835 +#: documentation/content/en/articles/committers-guide/_index.adoc:1848 +#: documentation/content/en/articles/committers-guide/_index.adoc:1868 +#: documentation/content/en/articles/committers-guide/_index.adoc:1882 +#: documentation/content/en/articles/committers-guide/_index.adoc:1906 #: documentation/content/en/articles/committers-guide/_index.adoc:1918 -#: documentation/content/en/articles/committers-guide/_index.adoc:1929 -#: documentation/content/en/articles/committers-guide/_index.adoc:1939 -#: documentation/content/en/articles/committers-guide/_index.adoc:1979 -#: documentation/content/en/articles/committers-guide/_index.adoc:1987 +#: documentation/content/en/articles/committers-guide/_index.adoc:1937 +#: documentation/content/en/articles/committers-guide/_index.adoc:1948 +#: documentation/content/en/articles/committers-guide/_index.adoc:1958 #: documentation/content/en/articles/committers-guide/_index.adoc:1998 -#: documentation/content/en/articles/committers-guide/_index.adoc:2019 -#: documentation/content/en/articles/committers-guide/_index.adoc:2080 +#: documentation/content/en/articles/committers-guide/_index.adoc:2006 +#: documentation/content/en/articles/committers-guide/_index.adoc:2017 +#: documentation/content/en/articles/committers-guide/_index.adoc:2038 +#: documentation/content/en/articles/committers-guide/_index.adoc:2099 #, no-wrap msgid "[source,shell]\n" msgstr "" @@ -3403,9 +3404,9 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:1615 #, no-wrap msgid "" -"% git branch issue # Create the 'issue' branch\n" -"% git reset --hard freebsd/main # Reset 'main' back to the official tip\n" -"% git checkout issue # Back to where you were\n" +"% git checkout -b issue # Create the 'issue' branch\n" +"% git checkout -B main freebsd/main # Reset main to upstream\n" +"% git checkout issue # Back to where you were\n" msgstr "" #. type: Title ===== @@ -3441,21 +3442,29 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1637 +#: documentation/content/en/articles/committers-guide/_index.adoc:1636 +#, no-wrap +msgid "If it is not the last commit, you can cherry-pick that one change from wilma onto fred, then use `git rebase -i` to remove the change from wilma.\n" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:1643 #, no-wrap msgid "" -"Git experts would first rewind the wilma branch by 1 commit, switch over to fred and then use `git reflog` to see what that 1 deleted commit was and\n" -"cherry-pick it over.\n" +"# We're on branch wilma\n" +"% git checkout fred\t\t\t# move to fred branch\n" +"% git cherry-pick HASH_OF_CHANGE\t# copy the misplaced commit\n" +"% git rebase -i main wilma\t\t# drop the cherry-picked change\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1639 +#: documentation/content/en/articles/committers-guide/_index.adoc:1646 #, no-wrap msgid "**Q:** But what if I want to commit a few changes to `main`, but keep the rest in `wilma` for some reason?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1645 +#: documentation/content/en/articles/committers-guide/_index.adoc:1652 #, no-wrap msgid "" "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\n" @@ -3466,13 +3475,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1647 +#: documentation/content/en/articles/committers-guide/_index.adoc:1654 #, no-wrap msgid "**Q:** I want to split off some changes from branch `wilma` into branch `fred`\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1653 +#: documentation/content/en/articles/committers-guide/_index.adoc:1660 #, no-wrap msgid "" "**A:** The more general answer would be the same as the previous.\n" @@ -3483,7 +3492,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1658 +#: documentation/content/en/articles/committers-guide/_index.adoc:1665 #, no-wrap msgid "" "The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree.\n" @@ -3493,7 +3502,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1665 +#: documentation/content/en/articles/committers-guide/_index.adoc:1672 msgid "" "% git checkout pre-split\t# Go back % git branch -D fred\t\t# delete the " "fred branch % git checkout -B wilma\t\t# reset the wilma branch % git branch " @@ -3501,7 +3510,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1669 +#: documentation/content/en/articles/committers-guide/_index.adoc:1676 #, no-wrap msgid "" "The last step is optional.\n" @@ -3509,7 +3518,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1673 +#: documentation/content/en/articles/committers-guide/_index.adoc:1680 #, no-wrap msgid "" "**Q:** But I did things as I read along and didn't see your advice at the end to create a branch, and now `fred` and `wilma` are all screwed up.\n" @@ -3518,13 +3527,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1675 +#: documentation/content/en/articles/committers-guide/_index.adoc:1682 #, no-wrap msgid "**A:** All is not lost. You can figure out it, so long as it hasn't been too long, or too many commits (hundreds).\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1679 +#: documentation/content/en/articles/committers-guide/_index.adoc:1686 #, no-wrap msgid "" "So I created a wilma branch and committed a couple of things to it, then decided I wanted to split it into fred and wilma.\n" @@ -3533,7 +3542,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1694 +#: documentation/content/en/articles/committers-guide/_index.adoc:1701 msgid "" "% git reflog 6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning " "to refs/heads/wilma 6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): " @@ -3546,7 +3555,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1702 +#: documentation/content/en/articles/committers-guide/_index.adoc:1709 #, no-wrap msgid "" "Here we see the changes I've made.\n" @@ -3558,7 +3567,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1710 +#: documentation/content/en/articles/committers-guide/_index.adoc:1717 #, no-wrap msgid "" "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up.\n" @@ -3571,12 +3580,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1715 +#: documentation/content/en/articles/committers-guide/_index.adoc:1722 msgid "% git checkout -B wilma 869cbd3 % git branch -D fred" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1722 +#: documentation/content/en/articles/committers-guide/_index.adoc:1729 #, no-wrap msgid "" "and you are ready to try again.\n" @@ -3587,12 +3596,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1728 +#: documentation/content/en/articles/committers-guide/_index.adoc:1735 msgid "% git checkout 869cbd3 M\tfaq.md Note: checking out '869cbd3'." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1732 +#: documentation/content/en/articles/committers-guide/_index.adoc:1739 msgid "" "You are in 'detached HEAD' state. You can look around, make experimental " "changes and commit them, and you can discard any commits you make in this " @@ -3600,31 +3609,31 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1735 +#: documentation/content/en/articles/committers-guide/_index.adoc:1742 msgid "" "If you want to create a new branch to retain commits you create, you may do " "so (now or later) by using -b with the checkout command again. Example:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1740 +#: documentation/content/en/articles/committers-guide/_index.adoc:1747 msgid "HEAD is now at 869cbd3 Encourage contributions % git checkout -B wilma" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1743 +#: documentation/content/en/articles/committers-guide/_index.adoc:1750 #, no-wrap msgid "this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate.\n" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1744 +#: documentation/content/en/articles/committers-guide/_index.adoc:1751 #, no-wrap msgid "Ooops! I did a `git pull` and it created a merge commit, what do I do?" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1748 +#: documentation/content/en/articles/committers-guide/_index.adoc:1755 #, no-wrap msgid "" "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\n" @@ -3632,13 +3641,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1750 +#: documentation/content/en/articles/committers-guide/_index.adoc:1757 #, no-wrap msgid "**A:** This can happen when you invoke the pull with your development branch checked out.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1753 +#: documentation/content/en/articles/committers-guide/_index.adoc:1759 +#, no-wrap +msgid "Many developers use `git pull --rebase` to avoid this situation.\n" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1762 #, no-wrap msgid "" "Right after the pull, you will have the new merge commit checked out.\n" @@ -3646,7 +3661,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1758 +#: documentation/content/en/articles/committers-guide/_index.adoc:1767 #, no-wrap msgid "" "git log --oneline HEAD^1 # Look at the first parent's commits\n" @@ -3654,7 +3669,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1762 +#: documentation/content/en/articles/committers-guide/_index.adoc:1771 #, no-wrap msgid "" "From those logs, you can easily identify which commit is your development work.\n" @@ -3662,18 +3677,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1766 -msgid "git reset --hard HEAD^2" +#: documentation/content/en/articles/committers-guide/_index.adoc:1775 +msgid "git reset --hard HEAD^1" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1778 +#, no-wrap +msgid "In addition, a `git pull --rebase` at this stage will rebase your changes to 'main' to the latest 'freebsd/main'.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1769 +#: documentation/content/en/articles/committers-guide/_index.adoc:1780 #, no-wrap msgid "**Q:** But I also need to fix my `main` branch. How do I do that?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1772 +#: documentation/content/en/articles/committers-guide/_index.adoc:1783 #, no-wrap msgid "" "**A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.\n" @@ -3681,12 +3702,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1776 +#: documentation/content/en/articles/committers-guide/_index.adoc:1787 msgid "git branch -f main freebsd/main" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1781 +#: documentation/content/en/articles/committers-guide/_index.adoc:1792 #, no-wrap msgid "" "There's nothing magical about branches in Git: they are just labels on a graph that are automatically moved forward by making commits.\n" @@ -3695,13 +3716,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1782 +#: documentation/content/en/articles/committers-guide/_index.adoc:1793 #, no-wrap msgid "Mixing and matching branches" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1786 +#: documentation/content/en/articles/committers-guide/_index.adoc:1797 #, no-wrap msgid "" "**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature`\n" @@ -3709,20 +3730,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1788 +#: documentation/content/en/articles/committers-guide/_index.adoc:1799 #, no-wrap msgid "**A:** This is a job for cherry pick.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1794 +#: documentation/content/en/articles/committers-guide/_index.adoc:1805 msgid "" "% git checkout worker % git checkout -b feature\t# create a new branch % git " "cherry-pick main..async\t# bring in the changes" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1799 +#: documentation/content/en/articles/committers-guide/_index.adoc:1810 #, no-wrap msgid "" "You now have a new branch called `feature`.\n" @@ -3731,13 +3752,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1801 +#: documentation/content/en/articles/committers-guide/_index.adoc:1812 #, no-wrap msgid "**Q:** I have a branch called `driver` and I'd like to break it up into `kernel` and `userland` so I can evolve them separately and commit each branch as it becomes ready.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1804 +#: documentation/content/en/articles/committers-guide/_index.adoc:1815 #, no-wrap msgid "" "**A:** This takes a little bit of prep work, but `git rebase` will do the heavy\n" @@ -3745,14 +3766,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1810 +#: documentation/content/en/articles/committers-guide/_index.adoc:1821 msgid "" "% git checkout driver\t\t# Checkout the driver % git checkout -b kernel\t# " "Create kernel branch % git checkout -b userland\t# Create userland branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1815 +#: documentation/content/en/articles/committers-guide/_index.adoc:1826 #, no-wrap msgid "" "Now you have two identical branches.\n" @@ -3761,29 +3782,29 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1819 +#: documentation/content/en/articles/committers-guide/_index.adoc:1830 msgid "% git rebase -i main kernel" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1822 +#: documentation/content/en/articles/committers-guide/_index.adoc:1833 #, no-wrap msgid "and just include the changes you want (with a 'p' or 'pick' line) and just delete the commits you don't (this sounds scary, but if worse comes to worse, you can throw this all away and start over with the `driver` branch since you've not yet moved it).\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1826 +#: documentation/content/en/articles/committers-guide/_index.adoc:1837 msgid "% git rebase -i main userland" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1829 +#: documentation/content/en/articles/committers-guide/_index.adoc:1840 #, no-wrap msgid "and do the same thing you did with the `kernel` branch.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1832 +#: documentation/content/en/articles/committers-guide/_index.adoc:1843 #, no-wrap msgid "" "**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch.\n" @@ -3791,7 +3812,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1835 +#: documentation/content/en/articles/committers-guide/_index.adoc:1846 #, no-wrap msgid "" "**A:** You can use the `driver` branch to find the hash of the commit is missing and\n" @@ -3799,12 +3820,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1841 +#: documentation/content/en/articles/committers-guide/_index.adoc:1852 msgid "% git checkout kernel % git log driver % git cherry-pick $HASH" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1847 +#: documentation/content/en/articles/committers-guide/_index.adoc:1858 #, no-wrap msgid "" "**Q:** OK. I have the same situation as the above, but my commits are all mixed up.\n" @@ -3814,7 +3835,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1850 +#: documentation/content/en/articles/committers-guide/_index.adoc:1861 #, no-wrap msgid "" "**A:** In this situation, you'd be better off to curate the original branch to separate\n" @@ -3822,7 +3843,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1855 +#: documentation/content/en/articles/committers-guide/_index.adoc:1866 #, no-wrap msgid "" "So let's assume that there's just one commit with a clean tree.\n" @@ -3832,18 +3853,18 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1859 +#: documentation/content/en/articles/committers-guide/_index.adoc:1870 msgid "% git reset HEAD^" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1862 +#: documentation/content/en/articles/committers-guide/_index.adoc:1873 #, no-wrap msgid "Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1866 +#: documentation/content/en/articles/committers-guide/_index.adoc:1877 #, no-wrap msgid "" "Now, if you are lucky, the change needing to be split up falls entirely along file lines.\n" @@ -3852,7 +3873,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1869 +#: documentation/content/en/articles/committers-guide/_index.adoc:1880 #, no-wrap msgid "" "If you are not lucky, you'll need to split apart files.\n" @@ -3860,12 +3881,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1873 +#: documentation/content/en/articles/committers-guide/_index.adoc:1884 msgid "git add -i foo/bar.c" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1879 +#: documentation/content/en/articles/committers-guide/_index.adoc:1890 #, no-wrap msgid "" "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk.\n" @@ -3874,31 +3895,52 @@ msgid "" "and use the `git rebase -i` to fold the related commits together).\n" msgstr "" +#. type: Title ===== +#: documentation/content/en/articles/committers-guide/_index.adoc:1891 +#, no-wrap +msgid "Joining the FreeBSD GitHub oranization." +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1894 +#, no-wrap +msgid "**Q:** How do I join the FreeBSD GitHub organization?\n" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1898 +#, no-wrap +msgid "" +"**A:** Please see https://wiki.freebsd.org/GitHub#Joining_the_Organisation[our GitHub Wiki Info] page for details.\n" +"Briefly, all FreeBSD committers may join.\n" +"Those who are not committers who request joining will be considered on a case by case basis.\n" +msgstr "" + #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1880 +#: documentation/content/en/articles/committers-guide/_index.adoc:1899 #, no-wrap msgid "Cloning and Mirroring" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1883 +#: documentation/content/en/articles/committers-guide/_index.adoc:1902 #, no-wrap msgid "**Q:** I'd like to mirror the entire Git repository, how do I do that?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1885 +#: documentation/content/en/articles/committers-guide/_index.adoc:1904 #, no-wrap msgid "**A:** If all you want to do is mirror, then\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1889 +#: documentation/content/en/articles/committers-guide/_index.adoc:1908 msgid "% git clone --mirror $URL" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1893 +#: documentation/content/en/articles/committers-guide/_index.adoc:1912 #, no-wrap msgid "" "will do the trick.\n" @@ -3906,7 +3948,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1897 +#: documentation/content/en/articles/committers-guide/_index.adoc:1916 #, no-wrap msgid "" "First, this is a 'bare repository' which has the repository database, but no checked out worktree.\n" @@ -3915,7 +3957,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1905 +#: documentation/content/en/articles/committers-guide/_index.adoc:1924 msgid "" "% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd " "ports.git % git worktree add ../ports main % git worktree add ../quarterly " @@ -3923,13 +3965,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1908 +#: documentation/content/en/articles/committers-guide/_index.adoc:1927 #, no-wrap msgid "But if you aren't using your mirror for further local clones, then it's a poor match.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1911 +#: documentation/content/en/articles/committers-guide/_index.adoc:1930 #, no-wrap msgid "" "The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream.\n" @@ -3937,13 +3979,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1913 +#: documentation/content/en/articles/committers-guide/_index.adoc:1932 #, no-wrap msgid "**Q:** So what can I do instead?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1916 +#: documentation/content/en/articles/committers-guide/_index.adoc:1935 #, no-wrap msgid "" "**A:** Well, you can stuff all of the upstream repository's refs into a private namespace in your local repository.\n" @@ -3951,19 +3993,19 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1920 +#: documentation/content/en/articles/committers-guide/_index.adoc:1939 #, no-wrap msgid " fetch = +refs/heads/*:refs/remotes/freebsd/*\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1923 +#: documentation/content/en/articles/committers-guide/_index.adoc:1942 #, no-wrap msgid "which says just fetch the branch refs.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1927 +#: documentation/content/en/articles/committers-guide/_index.adoc:1946 #, no-wrap msgid "" "However, the FreeBSD repository has a number of other things in it.\n" @@ -3972,12 +4014,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1931 +#: documentation/content/en/articles/committers-guide/_index.adoc:1950 msgid "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1935 +#: documentation/content/en/articles/committers-guide/_index.adoc:1954 #, no-wrap msgid "" "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace.\n" @@ -3985,30 +4027,30 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1937 +#: documentation/content/en/articles/committers-guide/_index.adoc:1956 #, no-wrap msgid "You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1941 +#: documentation/content/en/articles/committers-guide/_index.adoc:1960 msgid "git log refs/freebsd/vendor/zlib/1.2.10" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1944 +#: documentation/content/en/articles/committers-guide/_index.adoc:1963 #, no-wrap msgid "would look at the log for the vendor branch for zlib starting at 1.2.10.\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1945 +#: documentation/content/en/articles/committers-guide/_index.adoc:1964 #, no-wrap msgid "Collaborating with others" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1949 +#: documentation/content/en/articles/committers-guide/_index.adoc:1968 msgid "" "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 " @@ -4020,14 +4062,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1951 +#: documentation/content/en/articles/committers-guide/_index.adoc:1970 msgid "" "The following instructions show how to set up a user-generated branch, based " "on the FreeBSD `main` branch, and push it to GitHub." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1954 +#: documentation/content/en/articles/committers-guide/_index.adoc:1973 msgid "" "Before you begin, make sure that your local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -4035,14 +4077,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1961 +#: documentation/content/en/articles/committers-guide/_index.adoc:1980 msgid "" "[source,shell] ```` % git remote -v freebsd https://git.freebsd.org/src.git " "(fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) ````" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1964 +#: documentation/content/en/articles/committers-guide/_index.adoc:1983 msgid "" "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/" @@ -4051,14 +4093,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1967 +#: documentation/content/en/articles/committers-guide/_index.adoc:1986 msgid "" "Now add a remote on your local system that points to your fork: " "[source,shell]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1974 +#: documentation/content/en/articles/committers-guide/_index.adoc:1993 msgid "" "% git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v " "github\tgit@github.com:gvnn3/freebsd-src.git (fetch) " @@ -4068,7 +4110,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1977 +#: documentation/content/en/articles/committers-guide/_index.adoc:1996 #, no-wrap msgid "" "With this in place you can create a branch\n" @@ -4076,12 +4118,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1981 +#: documentation/content/en/articles/committers-guide/_index.adoc:2000 msgid "% git checkout -b gnn-pr2001-fix" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1985 +#: documentation/content/en/articles/committers-guide/_index.adoc:2004 #, no-wrap msgid "" "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.\n" @@ -4089,26 +4131,26 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1991 +#: documentation/content/en/articles/committers-guide/_index.adoc:2010 msgid "" "% git push github fatal: The current branch gnn-pr2001-fix has no upstream " "branch. To push the current branch and set the remote as upstream, use" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1993 +#: documentation/content/en/articles/committers-guide/_index.adoc:2012 #, no-wrap msgid " git push --set-upstream github gnn-pr2001-fix\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1996 +#: documentation/content/en/articles/committers-guide/_index.adoc:2015 #, no-wrap msgid "Setting the push as +git+ advises allows it to succeed:\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2012 +#: documentation/content/en/articles/committers-guide/_index.adoc:2031 #, no-wrap msgid "" "% git push --set-upstream github gnn-feature\n" @@ -4127,7 +4169,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2014 +#: documentation/content/en/articles/committers-guide/_index.adoc:2033 #, no-wrap msgid "" "[new branch] gnn-feature -> gnn-feature\n" @@ -4135,13 +4177,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2017 +#: documentation/content/en/articles/committers-guide/_index.adoc:2036 #, no-wrap msgid "Subsequent changes to the same branch will push correctly by default:\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2030 +#: documentation/content/en/articles/committers-guide/_index.adoc:2049 #, no-wrap msgid "" "% git push\n" @@ -4157,7 +4199,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2034 +#: documentation/content/en/articles/committers-guide/_index.adoc:2053 #, no-wrap msgid "" "At this point your work is now in your branch on +GitHub+ and you can\n" @@ -4165,19 +4207,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2055 #, no-wrap msgid "[[github-pull-land]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2055 #, no-wrap msgid "Landing a github pull request" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2041 +#: documentation/content/en/articles/committers-guide/_index.adoc:2060 msgid "" "This section documents how to land a GitHub pull request that's submitted " "against the FreeBSD Git mirrors at GitHub. While this is not an official " @@ -4190,7 +4232,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2046 +#: documentation/content/en/articles/committers-guide/_index.adoc:2065 msgid "" "Before beginning, make sure that the local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -4198,7 +4240,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2052 +#: documentation/content/en/articles/committers-guide/_index.adoc:2071 msgid "" "% git remote -v freebsd https://git.freebsd.org/src.git (fetch) freebsd " "ssh://git@gitrepo.freebsd.org/src.git (push) github https://github.com/" @@ -4207,7 +4249,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2072 +#: documentation/content/en/articles/committers-guide/_index.adoc:2091 #, no-wrap msgid "" *** 70657 LINES SKIPPED ***