diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 8f46fd295..febbf317c 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -188,8 +188,8 @@ "Scan Time Remaining": "Zeit für Scan verbleibend", "Scanning": "Scannen", "See external versioner help for supported templated command line parameters.": "Siehe externe Versionshilfe für unterstützte Befehlszeilenparameter.", - "See external versioning help for supported templated command line parameters.": "Siehe externe Versionshilfe für unterstützte Befehlszeilenparameter.", - "Select a version": "Version auswählen", + "See external versioning help for supported templated command line parameters.": "Siehe Hilfe zur externen Versionierung für unterstützte Befehlszeilenparameter.", + "Select a version": "Wähle eine Version", "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du diesen Ordner teilen willst.", "Select the folders to share with this device.": "Wähle die Ordner aus, die Du mit diesem Gerät teilen möchtest", "Send & Receive": "Senden & empfangen", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index b8abd12cc..9af26dea2 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -189,7 +189,7 @@ "Scanning": "Analyse en cours", "See external versioner help for supported templated command line parameters.": "Voir l'aide sur la préservation externe des fichiers pour les paramètres supportés en lignes de commande dans les modèles.", "See external versioning help for supported templated command line parameters.": "Consulter l'aide à la gestion externe des versions pour voir les paramètres de ligne de commande supportés.", - "Select a version": "Sélectionnez une version", + "Select a version": "Choisissez une version", "Select the devices to share this folder with.": "Synchroniser avec :", "Select the folders to share with this device.": "Sélectionner les partages auxquels cet appareil doit participer :", "Send & Receive": "Envoi & réception", @@ -259,7 +259,7 @@ "Time": "Heure", "Trash Can File Versioning": "Style poubelle", "Type": "Type", - "Undecided (will prompt)": "Choix différé (Une question sera affichée)", + "Undecided (will prompt)": "Choix différé (Une question sera affichée plus tard)", "Unknown": "Inconnu", "Unshared": "Non partagé", "Unused": "Non utilisé", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 8ad35b063..65da64852 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "September 08, 2017" "v0.14" "Syncthing" +.TH "STDISCOSRV" "1" "November 18, 2017" "v0.14" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 6f085b6f6..837a1c5a9 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "September 08, 2017" "v0.14" "Syncthing" +.TH "STRELAYSRV" "1" "November 18, 2017" "v0.14" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 6be0a91d6..4381b90c7 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-BEP" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 115636ca2..529e1c962 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 1698c3369..1ee98e81c 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" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 0c33ab524..b5814523e 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" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-event-api \- Event API . @@ -37,7 +37,12 @@ core utility towards a GUI. .sp To receive events, perform a HTTP GET of \fB/rest/events\fP or \fB/rest/events/disk\fP\&. The latter returns only local\-change\-detected and -remote\-change\-detected events, the former all other events. +remote\-change\-detected events, the former all other events unless filtered. +.sp +To filter the event list, in effect creating a specific subscription for +only the desired event types, add a parameter +\fBevents=EventTypeA,EventTypeB,...\fP where the event types are any from the +list below. .sp The optional parameter \fBsince=\fP sets the ID of the last event you\(aqve already seen. Syncthing returns a JSON encoded array of event objects, diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 7a9756f7c..7cd0cd68e 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -211,6 +211,17 @@ 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. +.SS How do I serve a folder from a read only filesystem? +.sp +Syncthing requires a "folder marker" to indicate that the folder is present +and healthy. By default this is a directory called \fB\&.stfolder\fP that is +created by Syncthing when the folder is added. If this folder can\(aqt be +created (you are serving files from a CD or something) you can instead set +the advanced config \fBMarker Name\fP to the name of some file or folder that +you know will always exist in the folder. +.SS I really hate the \fB\&.stfolder\fP directory, can I remove it? +.sp +See the previous question. .SS Am I able to use nested Syncthing folders? .sp Do not nest shared folders. This behaviour is in no way supported, diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 06a401f3f..2da7a7863 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 64c35d36b..e0e2239d2 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 8d1741b5d..02afa23ca 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 9088739b5..52a57ca24 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index e375af4a7..2d577b5d1 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" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -670,7 +670,10 @@ folder. Takes \fBdevice\fP and \fBfolder\fP parameters. .nf .ft C { - "completion": 0 + "completion": 100, + "globalBytes": 156793013575, + "needBytes": 0, + "needDeletes": 0 } .ft P .fi @@ -928,7 +931,12 @@ core utility towards a GUI. .sp To receive events, perform a HTTP GET of \fB/rest/events\fP or \fB/rest/events/disk\fP\&. The latter returns only local\-change\-detected and -remote\-change\-detected events, the former all other events. +remote\-change\-detected events, the former all other events unless filtered. +.sp +To filter the event list, in effect creating a specific subscription for +only the desired event types, add a parameter +\fBevents=EventTypeA,EventTypeB,...\fP where the event types are any from the +list below. .sp The optional parameter \fBsince=\fP sets the ID of the last event you\(aqve already seen. Syncthing returns a JSON encoded array of event objects, diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index f7452f394..62f46c58e 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 3d783692d..ae59e5927 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "November 18, 2017" "v0.14" "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 60fcdd408..06a3e6e22 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "November 18, 2017" "v0.14" "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 8e9dfa68c..4cccb3b93 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "September 08, 2017" "v0.14" "Syncthing" +.TH "SYNCTHING" "1" "November 18, 2017" "v0.14" "Syncthing" .SH NAME syncthing \- Syncthing . @@ -36,11 +36,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .sp .nf .ft C -syncthing [\-audit] [\-auditfile=] [\-browser\-only] [\-generate=] - [\-gui\-address=
] [\-gui\-apikey=] [\-home=] [\-logfile=] - [\-logflags=] [\-no\-browser] [\-no\-console] [\-no\-restart] [\-paths] [\-paused] - [\-reset\-database] [\-reset\-deltas] [\-upgrade] [\-upgrade\-check] [\-upgrade\-to=] - [\-verbose] [\-version] +syncthing [\-audit] [\-auditfile=] [\-browser\-only] [device\-id] + [\-generate=] [\-gui\-address=
] [\-gui\-apikey=] + [\-home=] [\-logfile=] [\-logflags=] + [\-no\-browser] [\-no\-console] [\-no\-restart] [\-paths] [\-paused] + [\-reset\-database] [\-reset\-deltas] [\-unpaused] [\-upgrade] + [\-upgrade\-check] [\-upgrade\-to=] [\-verbose] [\-version] .ft P .fi .UNINDENT @@ -66,6 +67,16 @@ Use specified file or stream (\fB"\-"\fP for stdout, \fB"\-\-"\fP for stderr) fo .UNINDENT .INDENT 0.0 .TP +.B \-browser\-only +Open the web UI in a browser for an already running Syncthing instance. +.UNINDENT +.INDENT 0.0 +.TP +.B \-device\-id +Print device ID to command line. +.UNINDENT +.INDENT 0.0 +.TP .B \-generate= Generate key and config in specified dir, then exit. .UNINDENT @@ -129,8 +140,15 @@ Print the paths used for configuration, keys, database, GUI overrides, default s .UNINDENT .INDENT 0.0 .TP +.B \-paused +Start with all devices and folders paused. +.UNINDENT +.INDENT 0.0 +.TP .B \-reset\-database Reset the database, forcing a full rescan and resync. +Create \fI\&.stfolder\fP folders in each sync folder if they do not already exist. +\fBCaution\fP: Ensure that all sync folders which are mountpoints are already mounted. Inconsistent versions may result if the mountpoint is later mounted and contains older versions. .UNINDENT .INDENT 0.0 .TP @@ -139,6 +157,11 @@ Reset delta index IDs, forcing a full index exchange. .UNINDENT .INDENT 0.0 .TP +.B \-unpaused +Start with all devices and folders unpaused. +.UNINDENT +.INDENT 0.0 +.TP .B \-upgrade Perform upgrade. .UNINDENT