Merging upstream version 4.23.0.

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

1 files changed, 31 insertions, 12 deletions

diff --git a/upstream/mageia-cauldron/man1/cp.1 b/upstream/mageia-cauldron/man1/cp.1
index a4fc879e..fb0e6e75 100644
--- a/upstream/mageia-cauldron/man1/cp.1
+++ b/upstream/mageia-cauldron/man1/cp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
-.TH CP "1" "April 2022" "GNU coreutils 9.1" "User Commands"
+.TH CP "1" "August 2023" "GNU coreutils 9.4" "User Commands"
 .SH NAME
 cp \- copy files and directories
 .SH SYNOPSIS
@@ -36,6 +36,9 @@ copy contents of special files when recursive
 \fB\-d\fR
 same as \fB\-\-no\-dereference\fR \fB\-\-preserve\fR=\fI\,links\/\fR
 .TP
+\fB\-\-debug\fR
+explain how a file is copied.  Implies \fB\-v\fR
+.TP
 \fB\-f\fR, \fB\-\-force\fR
 if an existing destination file cannot be
 opened, remove it and try again (this option
@@ -55,8 +58,8 @@ hard link files instead of copying
 always follow symbolic links in SOURCE
 .TP
 \fB\-n\fR, \fB\-\-no\-clobber\fR
-do not overwrite an existing file (overrides
-a previous \fB\-i\fR option)
+do not overwrite an existing file (overrides a
+\fB\-u\fR or previous \fB\-i\fR option). See also \fB\-\-update\fR
 .TP
 \fB\-P\fR, \fB\-\-no\-dereference\fR
 never follow symbolic links in SOURCE
@@ -65,10 +68,7 @@ never follow symbolic links in SOURCE
 same as \fB\-\-preserve\fR=\fI\,mode\/\fR,ownership,timestamps
 .TP
 \fB\-\-preserve\fR[=\fI\,ATTR_LIST\/\fR]
-preserve the specified attributes (default:
-mode,ownership,timestamps), if possible
-additional attributes: context, links, xattr,
-all
+preserve the specified attributes
 .TP
 \fB\-\-no\-preserve\fR=\fI\,ATTR_LIST\/\fR
 don't preserve the specified attributes
@@ -105,10 +105,12 @@ copy all SOURCE arguments into DIRECTORY
 \fB\-T\fR, \fB\-\-no\-target\-directory\fR
 treat DEST as a normal file
 .TP
-\fB\-u\fR, \fB\-\-update\fR
-copy only when the SOURCE file is newer
-than the destination file or when the
-destination file is missing
+\fB\-\-update\fR[=\fI\,UPDATE\/\fR]
+control which existing files are updated;
+UPDATE={all,none,older(default)}.  See below
+.TP
+\fB\-u\fR
+equivalent to \fB\-\-update\fR[=\fI\,older\/\fR]
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 explain what is being done
@@ -130,12 +132,26 @@ display this help and exit
 \fB\-\-version\fR
 output version information and exit
 .PP
+ATTR_LIST is a comma\-separated list of attributes. Attributes are 'mode' for
+permissions (including any ACL and xattr permissions), 'ownership' for user
+and group, 'timestamps' for file timestamps, 'links' for hard links, 'context'
+for security context, 'xattr' for extended attributes, and 'all' for all
+attributes.
+.PP
 By default, sparse SOURCE files are detected by a crude heuristic and the
 corresponding DEST file is made sparse as well.  That is the behavior
 selected by \fB\-\-sparse\fR=\fI\,auto\/\fR.  Specify \fB\-\-sparse\fR=\fI\,always\/\fR to create a sparse DEST
 file whenever the SOURCE file contains a long enough sequence of zero bytes.
 Use \fB\-\-sparse\fR=\fI\,never\/\fR to inhibit creation of sparse files.
 .PP
+UPDATE controls which existing files in the destination are replaced.
+\&'all' is the default operation when an \fB\-\-update\fR option is not specified,
+and results in all existing files in the destination being replaced.
+\&'none' is similar to the \fB\-\-no\-clobber\fR option, in that no files in the
+destination are replaced, but also skipped files do not induce a failure.
+\&'older' is the default operation when \fB\-\-update\fR is specified, and results
+in files being replaced if they're older than the corresponding source file.
+.PP
 When \fB\-\-reflink\fR[=\fI\,always\/\fR] is specified, perform a lightweight copy, where the
 data blocks are copied only when modified.  If this is not possible the copy
 fails, or if \fB\-\-reflink\fR=\fI\,auto\/\fR is specified, fall back to a standard copy.
@@ -167,12 +183,15 @@ GNU coreutils online help: <https://www.gnu.org/software/coreutils/>
 .br
 Report any translation bugs to <https://translationproject.org/team/>
 .SH COPYRIGHT
-Copyright \(co 2022 Free Software Foundation, Inc.
+Copyright \(co 2023 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
+\fBinstall\fP(1)
+.PP
+.br
 Full documentation <https://www.gnu.org/software/coreutils/cp>
 .br
 or available locally via: info \(aq(coreutils) cp invocation\(aq