Merge pull request #8622 from ThomasWaldmann/misc-changes-1.4

Misc. changes (1.4)
borgbackup · Jan 6, 2025 · e8c618f · e8c618f
2 parents 31cdc08 + 54e526c
commit e8c618f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 67 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2015-2024 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2025 The Borg Collective (see AUTHORS file)
 Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,12 +4,12 @@
 
 These borg releases are currently supported with security updates.
 
-| Version | Supported              |
-|---------|------------------------|
-| 1.4.x   | :x: (not released yet) |
-| 1.2.x   | :white_check_mark:     |
-| 1.1.x   | :x:                    |
-| < 1.1   | :x:                    |
+| Version | Supported          |
+|---------|--------------------|
+| 1.4.x   | :white_check_mark: |
+| 1.2.x   | :white_check_mark: |
+| 1.1.x   | :x:                |
+| < 1.1   | :x:                |
 
 ## Reporting a Vulnerability
 

diff --git a/docs/3rd_party/README b/docs/3rd_party/README
diff --git a/docs/3rd_party/lz4/LICENSE b/docs/3rd_party/lz4/LICENSE
diff --git a/docs/3rd_party/zstd/LICENSE b/docs/3rd_party/zstd/LICENSE
diff --git a/docs/conf.py b/docs/conf.py
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = 'Borg - Deduplicating Archiver'
-copyright = '2010-2014 Jonas Borgström, 2015-2024 The Borg Collective (see AUTHORS file)'
+copyright = '2010-2014 Jonas Borgström, 2015-2025 The Borg Collective (see AUTHORS file)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the