From 802b9337783a7e4bc117daacc212535f4310cee6 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 10 Feb 2021 07:45:27 +0100 Subject: [PATCH] gui, man, authors: Update docs, translations, and contributors --- AUTHORS | 1 + gui/default/assets/lang/lang-de.json | 14 +-- gui/default/assets/lang/lang-en-AU.json | 2 +- gui/default/assets/lang/lang-en.json | 6 ++ .../syncthing/core/aboutModalView.html | 2 +- man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 6 +- 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 | 85 +++++++++++-------- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 2 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 2 +- 21 files changed, 81 insertions(+), 63 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5ea517875..81f1114c8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -65,6 +65,7 @@ Choongkyu Chris Howie (cdhowie) Chris Joel (cdata) Chris Tonkinson +Christian Prescott chucic Colin Kennedy (moshen) Cromefire_ <26320625+cromefire@users.noreply.github.com> diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 70d6e89a9..a3fd4920c 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -25,7 +25,7 @@ "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Ein externer Befehl behandelt die Versionierung. Die Datei aus dem freigegebenen Ordner muss entfernen werden. Wenn der Pfad der Anwendung Leerzeichen enthält, sollte dieser in Anführungszeichen stehen.", "Anonymous Usage Reporting": "Anonymer Nutzungsbericht", "Anonymous usage report format has changed. Would you like to move to the new format?": "Das Format des anonymen Nutzungsberichts hat sich geändert. Möchten Sie auf das neue Format umsteigen?", - "Are you sure you want to permanently delete all these files?": "Sind Sie sicher, dass Sie all diese Dateien permanent löschen wollen?", + "Are you sure you want to permanently delete all these files?": "Sind Sie sicher, dass Sie all diese Dateien dauerhaft löschen möchten?", "Are you sure you want to remove device {%name%}?": "Sind Sie sicher, dass sie das Gerät {{name}} entfernen möchten?", "Are you sure you want to remove folder {%label%}?": "Sind Sie sicher, dass sie den Ordner {{label}} entfernen möchten?", "Are you sure you want to restore {%count%} files?": "Sind Sie sicher, dass Sie {{count}} Dateien wiederherstellen möchten?", @@ -62,7 +62,7 @@ "Danger!": "Achtung!", "Debugging Facilities": "Debugging-Möglichkeiten", "Default Folder Path": "Standardmäßiger Ordnerpfad", - "Delete Unexpected Items": "Lösche unerwartete Elemente", + "Delete Unexpected Items": "Unerwartete Elemente löschen", "Deleted": "Gelöscht", "Deselect All": "Alle abwählen", "Deselect devices to stop sharing this folder with.": "Die Geräte abwählen, für die dieser Ordner nicht mehr freigegeben werden soll.", @@ -72,7 +72,7 @@ "Device ID": "Gerätekennung", "Device Identification": "Geräteidentifikation", "Device Name": "Gerätename", - "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password", + "Device is untrusted, enter encryption password": "Gerät wird nicht vertraut, Verschlüsselungspasswort eingeben", "Device rate limits": "Gerät Datenratelimit", "Device that last modified the item": "Gerät, das das Element zuletzt geändert hat", "Devices": "Geräte", @@ -337,7 +337,7 @@ "The rate limit must be a non-negative number (0: no limit)": "Das Datenratelimit muss eine nicht negative Zahl sein (0 = kein Limit).", "The rescan interval must be a non-negative number of seconds.": "Das Scanintervall muss eine nicht negative Anzahl (in Sekunden) sein.", "There are no devices to share this folder with.": "Es gibt keine Geräte, mit denen dieser Ordner geteilt werden kann.", - "There are no folders to share with this device.": "There are no folders to share with this device.", + "There are no folders to share with this device.": "Es gibt keine Ordner, die mit diesem Gerät geteilt werden können.", "They are retried automatically and will be synced when the error is resolved.": "Sie werden automatisch heruntergeladen und werden synchronisiert, wenn der Fehler behoben wurde.", "This Device": "Dieses Gerät", "This can easily give hackers access to read and change any files on your computer.": "Dies kann dazu führen, dass Unberechtigte relativ einfach auf Ihre Dateien zugreifen und diese ändern können.", @@ -352,11 +352,11 @@ "Unavailable/Disabled by administrator or maintainer": "Nicht verfügbar/durch Administrator oder Betreuer deaktiviert", "Undecided (will prompt)": "Unentschlossen (wird nachgefragt)", "Unexpected Items": "Unerwartete Elemente", - "Unexpected items have been found in this folder.": "Unerwartete Elemente wurden in diesem Ordner gefunden.", + "Unexpected items have been found in this folder.": "In diesem Ordner wurden unerwartete Elemente gefunden.", "Unignore": "Beachten", "Unknown": "Unbekannt", "Unshared": "Ungeteilt", - "Unshared Devices": "Ungeteilte Geräte", + "Unshared Devices": "Nicht geteilte Geräte", "Unshared Folders": "Nicht geteilte Ordner", "Untrusted": "Nicht vertraut", "Up to Date": "Aktuell", @@ -403,5 +403,5 @@ "seconds": "Sekunden", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte den Ordner \"{{folder}}\" teilen.", "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner \"{{folderlabel}}\" ({{folder}}) teilen.", - "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device." + "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} könnte dieses Gerät wieder einführen." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-en-AU.json b/gui/default/assets/lang/lang-en-AU.json index cd9790f44..7da2c09a0 100644 --- a/gui/default/assets/lang/lang-en-AU.json +++ b/gui/default/assets/lang/lang-en-AU.json @@ -53,7 +53,7 @@ "Connection Error": "Connection Error", "Connection Type": "Connection Type", "Connections": "Connections", - "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.", + "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that fewer full scans are required.", "Copied from elsewhere": "Copied from elsewhere", "Copied from original": "Copied from original", "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:", diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index cd4ff2e17..7e63b88dd 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Danger!", "Debugging Facilities": "Debugging Facilities", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Default Folder Path", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Deleted", "Deselect All": "Deselect All", @@ -97,7 +101,9 @@ "Downloading": "Downloading", "Edit": "Edit", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Editing {{path}}.", "Enable Crash Reporting": "Enable Crash Reporting", "Enable NAT traversal": "Enable NAT traversal", diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index e17cf53c8..2ade3d6c0 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -19,7 +19,7 @@

The Syncthing Authors

-Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tomasz Wilczyński, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, klemens, marco-m, mv1005, otbutz, perewa, rubenbe, wangguoliang, xarx00, xjtdy888, 佛跳墙 +Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Tomasz Wilczyński, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, klemens, marco-m, mv1005, otbutz, perewa, rubenbe, wangguoliang, xarx00, xjtdy888, 佛跳墙

diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 30fdf6c07..b931cfdbd 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Feb 02, 2021" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Feb 08, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index ba9318660..eea0e645b 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Feb 02, 2021" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Feb 08, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 7f2a503c3..ba2809b5e 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 3fa7bc4e5..79dc423a7 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . @@ -38,7 +38,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .ft C $HOME/.config/syncthing $HOME/Library/Application Support/Syncthing -%LOCALAPPDATA%/Syncthing +%LOCALAPPDATA%\eSyncthing .ft P .fi .UNINDENT @@ -53,7 +53,7 @@ Syncthing uses a single directory to store configuration and crypto keys. Syncthing also has a database, which is often stored in this directory too. The config location defaults to \fB$HOME/.config/syncthing\fP (Unix\-like), \fB$HOME/Library/Application Support/Syncthing\fP (Mac), -or \fB%LOCALAPPDATA%/Syncthing\fP (Windows). It can be changed at runtime +or \fB%LOCALAPPDATA%\eSyncthing\fP (Windows). It can be changed at runtime using the \fB\-config\fP flag. In this directory the following files are located: .INDENT 0.0 diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 7d1a8d459..84a4a26a0 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" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Feb 08, 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 a2c66e2f3..cb55f523a 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" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 19c326baf..dd726fe62 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 706275d9b..52409d2cd 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 78dca3d50..dad91d7f9 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 2f0a63111..da69c8abb 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index d23f85416..68d195f4a 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Feb 08, 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 6752d3c4d..3773384fe 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" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -805,42 +805,53 @@ start building the structure. .sp .nf .ft C -$ curl \-s http://localhost:8384/rest/db/browse?folder=default | json_pp -{ - "directory": { - "file": ["2015\-04\-20T22:20:45+09:00", 130940928], - "subdirectory": { - "another file": ["2015\-04\-20T22:20:45+09:00", 130940928] - } - }, - "rootfile": ["2015\-04\-20T22:20:45+09:00", 130940928] -} - -$ curl \-s http://localhost:8384/rest/db/browse?folder=default&levels=0 | json_pp -{ - "directory": {}, - "rootfile": ["2015\-04\-20T22:20:45+09:00", 130940928] -} - -$ curl \-s http://localhost:8384/rest/db/browse?folder=default&levels=1 | json_pp -{ - "directory": { - "file": ["2015\-04\-20T22:20:45+09:00", 130940928], - "subdirectory": {} - }, - "rootfile": ["2015\-04\-20T22:20:45+09:00", 130940928] -} - -$ curl \-s http://localhost:8384/rest/db/browse?folder=default&prefix=directory/subdirectory | json_pp -{ - "another file": ["2015\-04\-20T22:20:45+09:00", 130940928] -} - -$ curl \-s http://localhost:8384/rest/db/browse?folder=default&prefix=directory&levels=0 | json_pp -{ - "file": ["2015\-04\-20T22:20:45+09:00", 130940928], - "subdirectory": {} -} +$ curl \-s http://localhost:8384/rest/db/browse?folder=j663y\-3ct3e&prefix=DCIM&levels=2 +[ + { + "modTime" : "2020\-10\-02T23:48:52.076996974+02:00", + "name" : "100ANDRO", + "size" : 128, + "type" : "FILE_INFO_TYPE_DIRECTORY" + }, + { + "children" : [ + { + "modTime" : "2020\-12\-16T23:31:34.5009668+01:00", + "name" : "IMG_20201114_124821.jpg", + "size" : 10682189, + "type" : "FILE_INFO_TYPE_FILE" + }, + { + "modTime" : "2020\-12\-16T23:31:35.0106367+01:00", + "name" : "IMG_20201213_122451.jpg", + "size" : 7936351, + "type" : "FILE_INFO_TYPE_FILE" + }, + { + "modTime" : "2020\-12\-13T12:25:05.017097469+01:00", + "name" : "IMG_20201213_122504.jpg", + "size" : 8406507, + "type" : "FILE_INFO_TYPE_FILE" + }, + { + "modTime" : "2020\-12\-13T12:25:06.127097469+01:00", + "name" : "IMG_20201213_122505.jpg", + "size" : 8381931, + "type" : "FILE_INFO_TYPE_FILE" + }, + { + "modTime" : "2020\-12\-13T12:53:29.707298401+01:00", + "name" : "IMG_20201213_125329.jpg", + "size" : 4388331, + "type" : "FILE_INFO_TYPE_FILE" + }, + ], + "modTime" : "2020\-10\-09T13:04:42.4410738+02:00", + "name" : "Camera", + "size" : 128, + "type" : "FILE_INFO_TYPE_DIRECTORY" + }, +] .ft P .fi .UNINDENT diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 72d39b65e..de825165b 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index ecb9bbf5a..96d2548c3 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Feb 08, 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 1d5ca4784..36f34673c 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Feb 08, 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 29ab01404..f06fdddda 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Feb 02, 2021" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Feb 08, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .