diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json
index 1262420cf..71bede30b 100644
--- a/gui/default/assets/lang/lang-pt-PT.json
+++ b/gui/default/assets/lang/lang-pt-PT.json
@@ -39,7 +39,7 @@
     "Bugs": "Erros",
     "Changelog": "Registo de alterações",
     "Clean out after": "Esvaziar ao fim de",
-    "Cleaning Versions": "Limpar versões",
+    "Cleaning Versions": "Limpando versões",
     "Cleanup Interval": "Intervalo entre limpezas",
     "Click to see discovery failures": "Clique para ver as falhas da pesquisa",
     "Close": "Fechar",
diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1
index 2183db075..4eb3555f1 100644
--- a/man/stdiscosrv.1
+++ b/man/stdiscosrv.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "Sep 23, 2020" "v1" "Syncthing"
+.TH "STDISCOSRV" "1" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .
diff --git a/man/strelaysrv.1 b/man/strelaysrv.1
index 9f4475f90..c79b9f8ad 100644
--- a/man/strelaysrv.1
+++ b/man/strelaysrv.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "Sep 23, 2020" "v1" "Syncthing"
+.TH "STRELAYSRV" "1" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7
index 752d47322..b7ea464b1 100644
--- a/man/syncthing-bep.7
+++ b/man/syncthing-bep.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
diff --git a/man/syncthing-config.5 b/man/syncthing-config.5
index 637f1fb8c..20da9e919 100644
--- a/man/syncthing-config.5
+++ b/man/syncthing-config.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7
index a81531a3e..14f90e22a 100644
--- a/man/syncthing-device-ids.7
+++ b/man/syncthing-device-ids.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7
index 10ad1ec76..9cebb6095 100644
--- a/man/syncthing-event-api.7
+++ b/man/syncthing-event-api.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7
index bdc6f2920..6e7dba5a7 100644
--- a/man/syncthing-faq.7
+++ b/man/syncthing-faq.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -185,23 +185,12 @@ device\-ids
 .UNINDENT
 .SH WHAT IF THERE IS A CONFLICT?
 .sp
-Syncthing does recognize conflicts. When a file has been modified on two devices
-simultaneously and the content actually differs, one of the files will be
-renamed to \fB<filename>.sync\-conflict\-<date>\-<time>\-<modifiedBy>.<ext>\fP\&. The file with the
-older modification time will be marked as the conflicting file and thus be
-renamed. If the modification times are equal, the file originating from the
-device which has the larger value of the first 63 bits for its device ID will be
-marked as the conflicting file.
-If the conflict is between a modification and a deletion of the file, the
-modified file always wins and is resurrected without renaming on the
-device where it was deleted.
-.sp
-Beware that the \fB<filename>.sync\-conflict\-<date>\-<time>\-<modifiedBy>.<ext>\fP files are
-treated as normal files after they are created, so they are propagated between
-devices. We do this because the conflict is detected and resolved on one device,
-creating the \fBsync\-conflict\fP file, but it’s just as much of a conflict
-everywhere else and we don’t know which of the conflicting files is the “best”
-from the user point of view.
+\fBSEE ALSO:\fP
+.INDENT 0.0
+.INDENT 3.5
+conflict\-handling
+.UNINDENT
+.UNINDENT
 .SH HOW DO I SERVE A FOLDER FROM A READ ONLY FILESYSTEM?
 .sp
 Syncthing requires a “folder marker” to indicate that the folder is present
diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7
index b87855562..0ff974b61 100644
--- a/man/syncthing-globaldisco.7
+++ b/man/syncthing-globaldisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7
index 78c0d95dc..9c2831b5f 100644
--- a/man/syncthing-localdisco.7
+++ b/man/syncthing-localdisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .
diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7
index 6237c8a60..a1c9b2c09 100644
--- a/man/syncthing-networking.7
+++ b/man/syncthing-networking.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7
index 9086c644b..3e814daa3 100644
--- a/man/syncthing-relay.7
+++ b/man/syncthing-relay.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .
diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7
index 33397caba..06e05c2c5 100644
--- a/man/syncthing-rest-api.7
+++ b/man/syncthing-rest-api.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
diff --git a/man/syncthing-security.7 b/man/syncthing-security.7
index f6602bc91..1eadd4dd0 100644
--- a/man/syncthing-security.7
+++ b/man/syncthing-security.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5
index 51fbfec4a..b2aa2f2ea 100644
--- a/man/syncthing-stignore.5
+++ b/man/syncthing-stignore.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7
index 52ae6a2f7..323ee875f 100644
--- a/man/syncthing-versioning.7
+++ b/man/syncthing-versioning.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-VERSIONING" "7" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .
diff --git a/man/syncthing.1 b/man/syncthing.1
index 050bc575d..526248991 100644
--- a/man/syncthing.1
+++ b/man/syncthing.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "Sep 23, 2020" "v1" "Syncthing"
+.TH "SYNCTHING" "1" "Oct 09, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .