From 572ccfe3e2bce7d8a56f3a2bc3a9d2c0481ece9d Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 13 Jan 2021 07:45:46 +0100 Subject: [PATCH] gui, man, authors: Update docs, translations, and contributors --- gui/default/assets/lang/lang-sv.json | 2 +- man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 2 +- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 78 ++++++++++++++++++++++++---- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 2 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 2 +- 17 files changed, 84 insertions(+), 26 deletions(-) diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 034f8b7e1..50805b49d 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -297,7 +297,7 @@ "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Lagrar och synkroniserar endast krypterade data. Mappar på alla anslutna enheter måste ställas in med samma lösenord eller vara av typen \"{{receiveEncrypted}}\".", "Support": "Support", "Support Bundle": "Support Bundle", - "Sync Protocol Listen Addresses": "Lyssnaradresser för synkroniseringsprotokollet", + "Sync Protocol Listen Addresses": "Lyssnaradresser för synkroniseringsprotokoll", "Syncing": "Synkroniserar", "Syncthing has been shut down.": "Syncthing har stängts.", "Syncthing includes the following software or portions thereof:": "Syncthing innehåller följande mjukvarupaket eller delar av dem:", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index eac2c5a32..c62db8fef 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Dec 30, 2020" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Jan 11, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index e7670deb0..c4cee414d 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Dec 30, 2020" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Jan 11, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index d9e7b7b40..fe295c3f1 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index c339d0236..386b601c1 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 3ec34d597..966645a84 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" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 11, 2021" "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 faf654fa2..6ac3c2037 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" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index df7607c28..3514d626c 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 42a93f62a..685b1b1ab 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 349b24180..2ce050827 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index b4e70d0fa..92f02594f 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 8b762b98a..7c2e20d39 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index ccea27658..7687a9fb2 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" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -165,13 +165,6 @@ Returns the current configuration. "maxSendKbps": 0, "maxRecvKbps": 0, "ignoredFolders": [], - "pendingFolders": [ - { - "time": "2019\-06\-05T10:21:22+02:00", - "id": "cpkn4\-57ysy", - "label": "SomeonesFolder" - } - ], "maxRequestKiB": 0 } ], @@ -252,8 +245,7 @@ Returns the current configuration. "databaseTuning": "auto", "maxConcurrentIncomingRequestKiB": 0 }, - "remoteIgnoredDevices": [], - "pendingDevices": [] + "remoteIgnoredDevices": [] } .ft P .fi @@ -729,6 +721,72 @@ and \fBPATCH\fP replaces only the given child objects. .sp \fBGET\fP returns the respective object, \fBPUT\fP replaces the entire object and \fBPATCH\fP replaces only the given child objects. +.SH CLUSTER ENDPOINTS +.sp +Concerns the mesh network structure. +.SS GET /rest/cluster/pending/devices +.sp +New in version 1.13.0. + +.sp +Lists remote devices which have tried to connect, but are not yet +configured in our instance. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +{ + "P56IOI7\-MZJNU2Y\-IQGDREY\-DM2MGTI\-MGL3BXN\-PQ6W5BM\-TBBZ4TJ\-XZWICQ2": { + "time": "2020\-03\-18T11:43:07Z", + "name": "Friend Joe", + "address": "192.168.1.2:22000" + } +} +.ft P +.fi +.UNINDENT +.UNINDENT +.SS GET /rest/cluster/pending/folders +.sp +New in version 1.13.0. + +.sp +Lists folders which remote devices have offered to us, but are not yet +shared from our instance to them. Takes the optional \fBdevice\fP +parameter to only return folders offered by a specific remote device. +Other offering devices are also omitted from the result. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +{ + "cpkn4\-57ysy": { + "offeredBy": { + "P56IOI7\-MZJNU2Y\-IQGDREY\-DM2MGTI\-MGL3BXN\-PQ6W5BM\-TBBZ4TJ\-XZWICQ2": { + "time": "2020\-03\-18T11:43:07Z", + "label": "Joe\(aqs folder" + }, + "DOVII4U\-SQEEESM\-VZ2CVTC\-CJM4YN5\-QNV7DCU\-5U3ASRL\-YVFG6TH\-W5DV5AA": { + "time": "2020\-03\-01T10:12:13Z", + "label": "Jane\(aqs and Joe\(aqs folder" + } + } + }, + "abcde\-fghij": { + "offeredBy": { + "P56IOI7\-MZJNU2Y\-IQGDREY\-DM2MGTI\-MGL3BXN\-PQ6W5BM\-TBBZ4TJ\-XZWICQ2": { + "time": "2020\-03\-18T11:43:07Z", + "label": "MyPics" + } + } + } +} +.ft P +.fi +.UNINDENT +.UNINDENT .SH DATABASE ENDPOINTS .SS GET /rest/db/browse .sp diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index f2ef27279..08f739148 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 15938a291..23f9ecab4 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Jan 11, 2021" "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 894be0a2b..e8c68ab54 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Jan 11, 2021" "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 2532c66e2..582972941 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Dec 30, 2020" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Jan 11, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .