gui, man, authors: Update docs, translations, and contributors

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "Feb 09, 2019" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Mar 05, 2019" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -150,7 +150,8 @@ compressed) decompressed.
 There is a certain amount of housekeeping that must be done to track the
 current and available versions of each file in the index database.
 .IP 4. 3
-By default Syncthing uses periodic scanning every 60 seconds to detect
+By default Syncthing uses periodic scanning every hour when watching for
+changes or every minute if that\(aqs disabled to detect
 file changes. This means checking every file\(aqs modification time and
 comparing it to the database. This can cause spikes of CPU usage for large
 folders.
@@ -169,10 +170,6 @@ environment variable \fBGOMAXPROCS\fP to the maximum number of CPU cores
 Syncthing should use at any given moment. For example, \fBGOMAXPROCS=2\fP on a
 machine with four cores will limit Syncthing to no more than half the
 system\(aqs CPU power.
-.sp
-To reduce CPU spikes from scanning activity, use a filesystem notifications
-plugin. This is delivered by default via Synctrayzor, Syncthing\-GTK and on
-Android. For other setups, consider using \fI\%syncthing\-inotify\fP <\fBhttps://github.com/syncthing/syncthing-inotify\fP>\&.
 .SH SHOULD I KEEP MY DEVICE IDS SECRET?
 .sp
 No. The IDs are not sensitive. Given a device ID it\(aqs possible to find the IP
@@ -196,7 +193,7 @@ device\-ids
 .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>.<ext>\fP\&. The file with the
+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 his device ID will be
@@ -205,14 +202,12 @@ 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>.<ext>\fP files are
+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\(aqs just as much of a conflict
 everywhere else and we don\(aqt know which of the conflicting files is the "best"
-from the user point of view. Moreover, if there\(aqs something that automatically
-causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-conflict
-\-...\-sync\-conflict\fP files.
+from the user point of view.
 .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
@@ -226,9 +221,11 @@ you know will always exist in the folder.
 See the previous question.
 .SH AM I ABLE TO NEST SHARED FOLDERS IN SYNCTHING?
 .sp
-Do not share a folder which is inside another shared folder. This behaviour
-is in no way supported, recommended or coded for in any way, and comes with
-many pitfalls.
+Sharing a folder that is within an already shared folder is possible, but it has
+its caveats. What you must absolutely avoid are circular shares. This is just
+one example, there may be other undesired effects. Nesting shared folders is not
+supported, recommended or coded for, but it can be done successfully when you
+know what you\(aqre doing \- you have been warned.
 .SH HOW DO I RENAME/MOVE A SYNCED FOLDER?
 .sp
 Syncthing doesn\(aqt have a direct way to do this, as it\(aqs potentially