Merging upstream version 4.23.0.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/upstream/opensuse-tumbleweed/man5/systemd.swap.5 b/upstream/opensuse-tumbleweed/man5/systemd.swap.5
index 04698ada..1cb7edb2 100644
--- a/upstream/opensuse-tumbleweed/man5/systemd.swap.5
+++ b/upstream/opensuse-tumbleweed/man5/systemd.swap.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\&.SWAP" "5" "" "systemd 254" "systemd.swap"
+.TH "SYSTEMD\&.SWAP" "5" "" "systemd 255" "systemd.swap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,6 +122,8 @@ With
 swap\&.target\&. This means that it will not be activated automatically during boot, unless it is pulled in by some other unit\&. The
 \fBauto\fR
 option has the opposite meaning and is the default\&.
+.sp
+Added in version 218\&.
 .RE
 .PP
 \fBnofail\fR
@@ -129,6 +131,8 @@ option has the opposite meaning and is the default\&.
 With
 \fBnofail\fR, the swap unit will be only wanted, not required by
 swap\&.target\&. This means that the boot will continue even if this swap device is not activated successfully\&.
+.sp
+Added in version 218\&.
 .RE
 .PP
 \fBx\-systemd\&.device\-timeout=\fR
@@ -144,6 +148,8 @@ Note that this option can only be used in
 /etc/fstab, and will be ignored when part of the
 \fIOptions=\fR
 setting in a unit file\&.
+.sp
+Added in version 215\&.
 .RE
 .PP
 \fBx\-systemd\&.makefs\fR
@@ -161,6 +167,8 @@ and the discussion of
 \fBwipefs\fR(8)
 in
 \fBsystemd.mount\fR(5)\&.
+.sp
+Added in version 240\&.
 .RE
 .SH "OPTIONS"
 .PP
@@ -199,6 +207,8 @@ May contain an option string for the swap device\&. This may be used for control
 \fBswapon\fR(8)
 for more information\&.) Note that the usual specifier expansion is applied to this setting, literal percent characters should hence be written as
 "%%"\&.
+.sp
+Added in version 217\&.
 .RE
 .PP
 \fITimeoutSec=\fR