diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1
index ce2d1553c..c15755433 100644
--- a/man/stdiscosrv.1
+++ b/man/stdiscosrv.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 "STDISCOSRV" "1" "Apr 26, 2021" "v1" "Syncthing"
+.TH "STDISCOSRV" "1" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .SH SYNOPSIS
diff --git a/man/strelaysrv.1 b/man/strelaysrv.1
index b11cb668a..fa7766878 100644
--- a/man/strelaysrv.1
+++ b/man/strelaysrv.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 "STRELAYSRV" "1" "Apr 26, 2021" "v1" "Syncthing"
+.TH "STRELAYSRV" "1" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .SH SYNOPSIS
@@ -50,7 +50,7 @@ strelaysrv [\-debug] [\-ext\-address=<address>] [\-global\-rate=<bytes/s>] [\-ke
 Syncthing relies on a network of community\-contributed relay servers. Anyone
 can run a relay server, and it will automatically join the relay pool and be
 available to Syncthing users. The current list of relays can be found at
-\fI\%http://relays.syncthing.net/\fP\&.
+\fI\%https://relays.syncthing.net/\fP\&.
 .SH OPTIONS
 .INDENT 0.0
 .TP
@@ -127,7 +127,7 @@ How often pings are sent (default 1m0s).
 .TP
 .B \-pools=<pool addresses>
 Comma separated list of relay pool addresses to join (default
-“\fI\%http://relays.syncthing.net/endpoint\fP”). Blank to disable announcement to
+“\fI\%https://relays.syncthing.net/endpoint\fP”). Blank to disable announcement to
 a pool, thereby remaining a private relay.
 .UNINDENT
 .INDENT 0.0
@@ -150,9 +150,9 @@ Status service is used by the relay pool server UI for displaying stats (data tr
 .sp
 Go to \fI\%releases\fP <\fBhttps://github.com/syncthing/relaysrv/releases\fP> and
 download the file appropriate for your operating system. Unpacking it will
-yield a binary called \fBrelaysrv\fP (or \fBrelaysrv.exe\fP on Windows).
+yield a binary called \fBstrelaysrv\fP (or \fBstrelaysrv.exe\fP on Windows).
 Start this in whatever way you are most comfortable with; double clicking
-should work in any graphical environment. At first start, relaysrv will
+should work in any graphical environment. At first start, strelaysrv will
 generate certificate files and database in the current directory unless
 given flags to the contrary. It will also join the default pools of relays,
 which means that it is publicly visible and any client can connect to it.
@@ -176,16 +176,16 @@ system:
 .sp
 .nf
 .ft C
-$ sudo useradd relaysrv
-$ sudo mkdir /etc/relaysrv
-$ sudo chown relaysrv /etc/relaysrv
-$ sudo \-u relaysrv /usr/local/bin/relaysrv \-keys /etc/relaysrv
+$ sudo useradd strelaysrv
+$ sudo mkdir /etc/strelaysrv
+$ sudo chown strelaysrv /etc/strelaysrv
+$ sudo \-u strelaysrv /usr/local/bin/strelaysrv \-keys /etc/strelaysrv
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .sp
-This creates a user \fBrelaysrv\fP and a directory \fB/etc/relaysrv\fP to store
+This creates a user \fBstrelaysrv\fP and a directory \fB/etc/strelaysrv\fP to store
 the keys. The keys are generated on first startup. The relay will join the
 global relay pool, unless a \fB\-pools=""\fP argument is given.
 .sp
@@ -247,8 +247,8 @@ COMMIT
 .UNINDENT
 .UNINDENT
 .sp
-You will need to start \fBrelaysrv\fP with \fB\-ext\-address ":443"\fP\&. This tells
-\fBrelaysrv\fP that it can be contacted on port 443, even though it is listening
+You will need to start \fBstrelaysrv\fP with \fB\-ext\-address ":443"\fP\&. This tells
+\fBstrelaysrv\fP that it can be contacted on port 443, even though it is listening
 on port 22067. You will also need to let both port 443 and 22067 through your
 firewall.
 .sp
@@ -257,7 +257,7 @@ although your mileage may vary.
 .SH FIREWALL CONSIDERATIONS
 .sp
 The relay server listens on two ports by default.  One for data connections and the other
-for providing public statistics at \fI\%http://relays.syncthing.net/\fP\&.  The firewall, such as
+for providing public statistics at \fI\%https://relays.syncthing.net/\fP\&.  The firewall, such as
 \fBiptables\fP, must permit incoming TCP connections to the following ports:
 .INDENT 0.0
 .IP \(bu 2
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7
index b8be755b8..f501590c3 100644
--- a/man/syncthing-bep.7
+++ b/man/syncthing-bep.7
@@ -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 "SYNCTHING-BEP" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .SH INTRODUCTION AND DEFINITIONS
diff --git a/man/syncthing-config.5 b/man/syncthing-config.5
index 97c988259..78e21204f 100644
--- a/man/syncthing-config.5
+++ b/man/syncthing-config.5
@@ -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 "SYNCTHING-CONFIG" "5" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .SH SYNOPSIS
diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7
index bebf14e5d..61f954b48 100644
--- a/man/syncthing-device-ids.7
+++ b/man/syncthing-device-ids.7
@@ -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 "SYNCTHING-DEVICE-IDS" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .sp
diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7
index 9ba134a14..b2b08045e 100644
--- a/man/syncthing-event-api.7
+++ b/man/syncthing-event-api.7
@@ -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 "SYNCTHING-EVENT-API" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .SH DESCRIPTION
diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7
index 2260e6cf9..7ed3459c6 100644
--- a/man/syncthing-faq.7
+++ b/man/syncthing-faq.7
@@ -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 "SYNCTHING-FAQ" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .INDENT 0.0
diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7
index fa10aab6c..2914de3c7 100644
--- a/man/syncthing-globaldisco.7
+++ b/man/syncthing-globaldisco.7
@@ -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 "SYNCTHING-GLOBALDISCO" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .SH ANNOUNCEMENTS
diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7
index 675f0d3b3..a5f6cc41d 100644
--- a/man/syncthing-localdisco.7
+++ b/man/syncthing-localdisco.7
@@ -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 "SYNCTHING-LOCALDISCO" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .SH MODE OF OPERATION
diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7
index 78f86c4be..73be1439e 100644
--- a/man/syncthing-networking.7
+++ b/man/syncthing-networking.7
@@ -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 "SYNCTHING-NETWORKING" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .SH ROUTER SETUP
diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7
index d339d9942..e7e55dd72 100644
--- a/man/syncthing-relay.7
+++ b/man/syncthing-relay.7
@@ -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 "SYNCTHING-RELAY" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .SH WHAT IS A RELAY?
diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7
index 41213c5c1..57cae98be 100644
--- a/man/syncthing-rest-api.7
+++ b/man/syncthing-rest-api.7
@@ -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 "SYNCTHING-REST-API" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .sp
diff --git a/man/syncthing-security.7 b/man/syncthing-security.7
index 6694b305e..2fcc8bd32 100644
--- a/man/syncthing-security.7
+++ b/man/syncthing-security.7
@@ -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 "SYNCTHING-SECURITY" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .sp
diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5
index 5ff8e8e5f..0bb447e99 100644
--- a/man/syncthing-stignore.5
+++ b/man/syncthing-stignore.5
@@ -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 "SYNCTHING-STIGNORE" "5" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .SH SYNOPSIS
diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7
index 7333851e2..6ed913233 100644
--- a/man/syncthing-versioning.7
+++ b/man/syncthing-versioning.7
@@ -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 "SYNCTHING-VERSIONING" "7" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .sp
@@ -88,16 +88,17 @@ that will be kept for each.
 .INDENT 0.0
 .TP
 .B 1 Hour
-For the first hour, the most recent version is kept every 30 seconds.
+For the first hour, the oldest version in every 30\-seconds interval is
+kept.
 .TP
 .B 1 Day
-For the first day, the most recent version is kept every hour.
+For the first day, the oldest version in every hour is kept.
 .TP
 .B 30 Days
-For the first 30 days, the most recent version is kept every day.
+For the first 30 days, the oldest version in every day is kept.
 .TP
 .B Until Maximum Age
-Until maximum age, the most recent version is kept every week.
+Until maximum age, the oldest version in every week is kept.
 .TP
 .B Maximum Age
 The maximum time to keep a version in days. For example, to keep replaced or
@@ -105,6 +106,14 @@ deleted files in the “.stversions” folder for an entire year, use 365. If
 only for 10 days, use 10.
 \fBNote: Set to 0 to keep versions forever.\fP
 .UNINDENT
+.sp
+This means that there is only one version in each interval and as files age they
+will be deleted unless when the interval they are entering is empty. By keeping
+the oldest versions this versioning scheme preserves the file if it is
+overwritten.
+.sp
+For more info, check the \fI\%unit test file\fP <\fBhttps://github.com/syncthing/syncthing/blob/main/lib/versioner/staggered_test.go#L32\fP>
+that shows which versions are deleted for a specific run.
 .SH EXTERNAL FILE VERSIONING
 .sp
 This versioning method delegates the decision on what to do to an
diff --git a/man/syncthing.1 b/man/syncthing.1
index 45b32e42a..0b7664a29 100644
--- a/man/syncthing.1
+++ b/man/syncthing.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 "SYNCTHING" "1" "Apr 26, 2021" "v1" "Syncthing"
+.TH "SYNCTHING" "1" "May 18, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .SH SYNOPSIS
@@ -55,6 +55,14 @@ machine will automatically be replicated to your other devices. We believe your
 data is your data alone and you deserve to choose where it is stored. Therefore
 Syncthing does not upload your data to the cloud but exchanges your data across
 your machines as soon as they are online at the same time.
+.sp
+The \fBsyncthing\fP core application is a command\-line program which usually runs
+in the background and handles the synchronization. It provides a built\-in, HTML
+and JavaScript based user interface to be controlled from a web browser. This
+frontend communicates with the core application through some HTTP APIs, which
+other apps like graphical system integration helpers can use as well, for
+greatest flexibility. A link to reach the GUI and API is printed among the first
+few log messages.
 .SH OPTIONS
 .INDENT 0.0
 .TP