Merge pull request #9204 from ThomasWaldmann/rel143

Release 1.4.3
2026-04-21 22:29:54 -04:00 · 2025-12-02 08:47:08 +01:00 · 2025-12-02 08:47:08 +01:00 · 6cfdd72433
commit 6cfdd72433
parent ad05ba8f37 509c5695e0
40 changed files with 50 additions and 48 deletions
--- a/docs/changes.rst
+++ b/docs/changes.rst
@ -414,8 +414,8 @@ Compatibility notes:
 Change Log
 ==========

-Version 1.4.3 (not released yet)
--------------------------------
+Version 1.4.3 (2025-12-02)
+--------------------------

 For upgrade and compatibility hints, please also read the "Upgrade Notes" section
 above.
@ -426,7 +426,9 @@ New features:

 Fixes:

- CI: FUSE-related fixes/improvements, #9182
+- compact: replace AssertionError with a warning, #8535.
+- compact: also fix segment hints data for lost segment files.
+- CI: FUSE-related fixes and improvements, #9182:

  - The Linux and FreeBSD binaries built on GitHub now include working
    FUSE support (based on llfuse).
@ -435,7 +437,7 @@ Fixes:

 Other changes:

- Drop Python 3.9 support (reached end of life at python.org)
+- Drop Python 3.9 support (has reached end of life at python.org).
 - CI:

  - Install the correct FUSE library depending on the tox environment.
@ -447,7 +449,7 @@ Other changes:
    binaries, #9135, #9136.
 - Docs:

-  - Some fixes/updates to the FAQ, #9188.
+  - Some fixes and updates to the FAQ, #9188.
  - Update binary README; release binaries are built on GitHub now.


--- a/docs/man/borg-benchmark-crud.1
+++ b/docs/man/borg-benchmark-crud.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-BENCHMARK-CRUD" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-BENCHMARK-CRUD" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-benchmark-crud \- Benchmark Create, Read, Update, Delete for archives.
 .SH SYNOPSIS
--- a/docs/man/borg-benchmark.1
+++ b/docs/man/borg-benchmark.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-BENCHMARK" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-BENCHMARK" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-benchmark \- benchmark command
 .SH SYNOPSIS
--- a/docs/man/borg-break-lock.1
+++ b/docs/man/borg-break-lock.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-BREAK-LOCK" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-BREAK-LOCK" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-break-lock \- Break the repository lock (e.g. in case it was left by a dead borg.
 .SH SYNOPSIS
--- a/docs/man/borg-check.1
+++ b/docs/man/borg-check.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-CHECK" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-CHECK" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-check \- Check repository consistency
 .SH SYNOPSIS
--- a/docs/man/borg-common.1
+++ b/docs/man/borg-common.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-COMMON" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-COMMON" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-common \- Common options of Borg commands
 .SH SYNOPSIS
--- a/docs/man/borg-compact.1
+++ b/docs/man/borg-compact.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-COMPACT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-COMPACT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-compact \- compact segment files in the repository
 .SH SYNOPSIS
--- a/docs/man/borg-compression.1
+++ b/docs/man/borg-compression.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-COMPRESSION" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-COMPRESSION" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-compression \- Details regarding compression
 .SH DESCRIPTION
--- a/docs/man/borg-config.1
+++ b/docs/man/borg-config.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-CONFIG" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-CONFIG" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-config \- get, set, and delete values in a repository or cache config file
 .SH SYNOPSIS
--- a/docs/man/borg-create.1
+++ b/docs/man/borg-create.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-CREATE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-CREATE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-create \- Create new archive
 .SH SYNOPSIS
--- a/docs/man/borg-delete.1
+++ b/docs/man/borg-delete.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-DELETE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-DELETE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-delete \- Delete an existing repository or archives
 .SH SYNOPSIS
--- a/docs/man/borg-diff.1
+++ b/docs/man/borg-diff.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-DIFF" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-DIFF" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-diff \- Diff contents of two archives
 .SH SYNOPSIS
--- a/docs/man/borg-export-tar.1
+++ b/docs/man/borg-export-tar.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-EXPORT-TAR" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-EXPORT-TAR" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-export-tar \- Export archive contents as a tarball
 .SH SYNOPSIS
--- a/docs/man/borg-extract.1
+++ b/docs/man/borg-extract.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-EXTRACT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-EXTRACT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-extract \- Extract archive contents
 .SH SYNOPSIS
--- a/docs/man/borg-import-tar.1
+++ b/docs/man/borg-import-tar.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-IMPORT-TAR" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-IMPORT-TAR" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-import-tar \- Create a backup archive from a tarball
 .SH SYNOPSIS
--- a/docs/man/borg-info.1
+++ b/docs/man/borg-info.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-INFO" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-INFO" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-info \- Show archive details such as disk space used
 .SH SYNOPSIS
--- a/docs/man/borg-init.1
+++ b/docs/man/borg-init.1
@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-INIT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-INIT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-init \- Initialize an empty repository
 .SH SYNOPSIS
--- a/docs/man/borg-key-change-passphrase.1
+++ b/docs/man/borg-key-change-passphrase.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-KEY-CHANGE-PASSPHRASE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-KEY-CHANGE-PASSPHRASE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-key-change-passphrase \- Change repository key file passphrase
 .SH SYNOPSIS
--- a/docs/man/borg-key-export.1
+++ b/docs/man/borg-key-export.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-KEY-EXPORT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-KEY-EXPORT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-key-export \- Export the repository key for backup
 .SH SYNOPSIS
--- a/docs/man/borg-key-import.1
+++ b/docs/man/borg-key-import.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-KEY-IMPORT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-KEY-IMPORT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-key-import \- Import the repository key from backup
 .SH SYNOPSIS
--- a/docs/man/borg-key-migrate-to-repokey.1
+++ b/docs/man/borg-key-migrate-to-repokey.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-KEY-MIGRATE-TO-REPOKEY" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-KEY-MIGRATE-TO-REPOKEY" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-key-migrate-to-repokey \- Migrate passphrase -> repokey
 .SH SYNOPSIS
--- a/docs/man/borg-key.1
+++ b/docs/man/borg-key.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-KEY" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-KEY" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-key \- Manage a keyfile or repokey of a repository
 .SH SYNOPSIS
--- a/docs/man/borg-list.1
+++ b/docs/man/borg-list.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-LIST" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-LIST" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-list \- List archive or repository contents
 .SH SYNOPSIS
@ -150,7 +150,7 @@ $ borg list /path/to/repo/::archiveA \-\-pattern \(aq+ re:.ext$\(aq \-\-pattern
 .SH NOTES
 .SS The FORMAT specifier syntax
 .sp
-The \fB\-\-format\fP option uses Python\(aqs format string syntax <https://docs.python.org/3.9/library/string.html#formatstrings>
+The \fB\-\-format\fP option uses Python\(aqs format string syntax <https://docs.python.org/3.10/library/string.html#formatstrings>
 \&.
 .sp
 Examples:
--- a/docs/man/borg-mount.1
+++ b/docs/man/borg-mount.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-MOUNT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-MOUNT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-mount \- Mount archive or an entire repository as a FUSE filesystem
 .SH SYNOPSIS
--- a/docs/man/borg-patterns.1
+++ b/docs/man/borg-patterns.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-PATTERNS" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-PATTERNS" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-patterns \- Details regarding patterns
 .SH DESCRIPTION
--- a/docs/man/borg-placeholders.1
+++ b/docs/man/borg-placeholders.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-PLACEHOLDERS" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-PLACEHOLDERS" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-placeholders \- Details regarding placeholders
 .SH DESCRIPTION
@ -47,12 +47,12 @@ The full name of the machine in reverse domain name notation.
 .TP
 .B {now}
 The current local date and time, by default in ISO\-8601 format.
-You can also supply your own format string <https://docs.python.org/3.9/library/datetime.html#strftime-and-strptime-behavior>
+You can also supply your own format string <https://docs.python.org/3.10/library/datetime.html#strftime-and-strptime-behavior>
 , e.g. {now:%Y\-%m\-%d_%H:%M:%S}
 .TP
 .B {utcnow}
 The current UTC date and time, by default in ISO\-8601 format.
-You can also supply your own format string <https://docs.python.org/3.9/library/datetime.html#strftime-and-strptime-behavior>
+You can also supply your own format string <https://docs.python.org/3.10/library/datetime.html#strftime-and-strptime-behavior>
 , e.g. {utcnow:%Y\-%m\-%d_%H:%M:%S}
 .TP
 .B {user}
--- a/docs/man/borg-prune.1
+++ b/docs/man/borg-prune.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-PRUNE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-PRUNE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-prune \- Prune repository archives according to specified rules
 .SH SYNOPSIS
--- a/docs/man/borg-recreate.1
+++ b/docs/man/borg-recreate.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-RECREATE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-RECREATE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-recreate \- Re-create archives
 .SH SYNOPSIS
--- a/docs/man/borg-rename.1
+++ b/docs/man/borg-rename.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-RENAME" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-RENAME" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-rename \- Rename an existing archive
 .SH SYNOPSIS
--- a/docs/man/borg-serve.1
+++ b/docs/man/borg-serve.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-SERVE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-SERVE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-serve \- Start in server mode. This command is usually not used manually.
 .SH SYNOPSIS
--- a/docs/man/borg-umount.1
+++ b/docs/man/borg-umount.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-UMOUNT" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-UMOUNT" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-umount \- un-mount the FUSE filesystem
 .SH SYNOPSIS
--- a/docs/man/borg-upgrade.1
+++ b/docs/man/borg-upgrade.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-UPGRADE" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-UPGRADE" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-upgrade \- upgrade a repository from a previous version
 .SH SYNOPSIS
--- a/docs/man/borg-version.1
+++ b/docs/man/borg-version.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-VERSION" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-VERSION" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-version \- Display the borg client / borg server version
 .SH SYNOPSIS
--- a/docs/man/borg-with-lock.1
+++ b/docs/man/borg-with-lock.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG-WITH-LOCK" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG-WITH-LOCK" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg-with-lock \- run a user specified command with the repository lock held
 .SH SYNOPSIS
--- a/docs/man/borg.1
+++ b/docs/man/borg.1
@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORG" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORG" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borg \- deduplicating and encrypting backup tool
 .SH SYNOPSIS
--- a/docs/man/borgfs.1
+++ b/docs/man/borgfs.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BORGFS" "1" "2025-10-31" "" "borg backup tool"
+.TH "BORGFS" "1" "2025-12-01" "" "borg backup tool"
 .SH NAME
 borgfs \- Mount archive or an entire repository as a FUSE filesystem
 .SH SYNOPSIS
--- a/docs/usage/diff.rst.inc
+++ b/docs/usage/diff.rst.inc
@ -77,7 +77,7 @@ borg diff
        --sort                         Sort the output by path (deprecated, use --sort-by=path).
        --sort-by FIELD[,FIELD...]     Advanced sorting: specify field(s) to sort by. Accepts a comma-separated list. Prefix with > for descending or < for ascending (default).
        --content-only                 Only compare differences in content (exclude metadata differences)
-        --json-lines                   Format output as JSON Lines. 
+        --json-lines                   Format output as JSON Lines.


    :ref:`common_options`
--- a/docs/usage/help.rst.inc
+++ b/docs/usage/help.rst.inc
@ -297,11 +297,11 @@ and ``--remote-path`` values support these placeholders:

 {now}
    The current local date and time, by default in ISO-8601 format.
-    You can also supply your own `format string <https://docs.python.org/3.9/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {now:%Y-%m-%d_%H:%M:%S}
+    You can also supply your own `format string <https://docs.python.org/3.10/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {now:%Y-%m-%d_%H:%M:%S}

 {utcnow}
    The current UTC date and time, by default in ISO-8601 format.
-    You can also supply your own `format string <https://docs.python.org/3.9/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S}
+    You can also supply your own `format string <https://docs.python.org/3.10/library/datetime.html#strftime-and-strptime-behavior>`_, e.g. {utcnow:%Y-%m-%d_%H:%M:%S}

 {user}
    The user name (or UID, if no name is available) of the user running borg.
--- a/docs/usage/list.rst.inc
+++ b/docs/usage/list.rst.inc
@ -113,7 +113,7 @@ The FORMAT specifier syntax
 +++++++++++++++++++++++++++

 The ``--format`` option uses Python's `format string syntax
-<https://docs.python.org/3.9/library/string.html#formatstrings>`_.
+<https://docs.python.org/3.10/library/string.html#formatstrings>`_.

 Examples:
 ::
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@ -4310,7 +4310,7 @@ class Archiver:
            help="Only compare differences in content (exclude metadata differences)",
        )
        subparser.add_argument('--json-lines', action='store_true',
-                               help='Format output as JSON Lines. ')
+                               help='Format output as JSON Lines.')
        subparser.add_argument('location', metavar='REPO::ARCHIVE1',
                               type=location_validator(archive=True),
                               help='repository location and ARCHIVE1 name')