octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-31 02:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakob Borg 2020-10-14 07:45:25 +02:00
parent d828adb648
commit 8e8e30dc7b
17 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/default/assets/lang/lang-pt-PT.json
View File

@ -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",

2
man/stdiscosrv.1
View File

@ -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
.

2
man/strelaysrv.1
View File

@ -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
.

2
man/syncthing-bep.7
View File

@ -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
.

2
man/syncthing-config.5
View File

@ -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
.

2
man/syncthing-device-ids.7
View File

@ -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
.

2
man/syncthing-event-api.7
View File

@ -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
.

25
man/syncthing-faq.7
View File

@ -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

2
man/syncthing-globaldisco.7
View File

@ -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
.

2
man/syncthing-localdisco.7
View File

@ -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
.

2
man/syncthing-networking.7
View File

@ -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
.

2
man/syncthing-relay.7
View File

@ -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
.

2
man/syncthing-rest-api.7
View File

@ -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
.

2
man/syncthing-security.7
View File

@ -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
.

2
man/syncthing-stignore.5
View File

@ -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
.

2
man/syncthing-versioning.7
View File

@ -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
.

2
man/syncthing.1
View File

@ -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
.