Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 15 deletions

diff --git a/upstream/fedora-40/man5/pacman.conf.5 b/upstream/fedora-40/man5/pacman.conf.5
index 9e994376..98004cc5 100644
--- a/upstream/fedora-40/man5/pacman.conf.5
+++ b/upstream/fedora-40/man5/pacman.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: pacman.conf
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-01-25
+.\"      Date: 2024-03-09
 .\"    Manual: Pacman Manual
-.\"    Source: Pacman 6.0.2
+.\"    Source: Pacman 6.1.0
 .\"  Language: English
 .\"
-.TH "PACMAN\&.CONF" "5" "2024\-01\-25" "Pacman 6\&.0\&.2" "Pacman Manual"
+.TH "PACMAN\&.CONF" "5" "2024\-03\-09" "Pacman 6\&.1\&.0" "Pacman Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -165,7 +165,7 @@ will use the system architecture, provided via \(lquname \-m\(rq\&. If unset, no
 can always be installed, as they are meant to be architecture independent\&.
 .RE
 .PP
-\fBXferCommand =\fR /path/to/command %u
+\fBXferCommand =\fR /path/to/command %u [%o]
 .RS 4
 If set, an external program will be used to download all remote files\&. All instances of
 %u
@@ -291,6 +291,11 @@ Include another config file\&. This file can include repositories or general con
 rules\&.
 .RE
 .PP
+\fBCacheServer =\fR url
+.RS 4
+A full URL to a location where the packages, and signatures (if available) for this repository can be found\&. Cache servers will be tried before any non\-cache servers, will not be removed from the server pool for 404 download errors, and will not be used for database files\&.
+.RE
+.PP
 \fBServer =\fR url
 .RS 4
 A full URL to a location where the database, packages, and signatures (if available) for this repository can be found\&.
@@ -499,17 +504,6 @@ Andrew Gregory <andrew\&.gregory\&.8@gmail\&.com>
 .sp -1
 .IP \(bu 2.3
 .\}
-Eli Schwartz <eschwartz@archlinux\&.org>
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 Morgan Adamiec <morganamilo@archlinux\&.org>
 .RE
 .sp
@@ -592,4 +586,15 @@ Nagy Gabor <ngaba@bibl\&.u\-szeged\&.hu>
 Dave Reisner <dreisner@archlinux\&.org>
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Eli Schwartz <eschwartz@archlinux\&.org>
+.RE
+.sp
 For additional contributors, use git shortlog \-s on the pacman\&.git repository\&.