Skip to content

Commit e55f1f5

Browse files
tomasz1986tomasz1986
committed
Merge branch 'main' into tomasz86/prs/update-windows-autostart
2 parents 414244e + 3ce309a commit e55f1f5

6 files changed

Lines changed: 21 additions & 12 deletions

File tree

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Cameron Steffen <cam.steffen94@gmail.com>
5656
camoz <camoz@users.noreply.github.com>
5757
Catfriend1 <16361913+Catfriend1@users.noreply.github.com>
5858
Cedric Staniewski (xduugu) <cedric@gmx.ca>
59+
chaosORCHESTRA <messagehf@pm.me>
5960
Christian Kellermann <ckeen@pestilenz.org>
6061
cmillsa2 <cmillsa2@gmail.com>
6162
Cory Salveson <corysalveson@gmail.com>

‎rest/system-config-get.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Returns the current configuration.
5454
"markerName": ".stfolder",
5555
"copyOwnershipFromParent": false,
5656
"modTimeWindowS": 0,
57-
"maxConcurrentWrites": 2,
57+
"maxConcurrentWrites": 16,
5858
"disableFsync": false,
5959
"blockPullOrder": "standard",
6060
"copyRangeMethod": "standard",
@@ -226,7 +226,7 @@ Returns the current configuration.
226226
"markerName": ".stfolder",
227227
"copyOwnershipFromParent": false,
228228
"modTimeWindowS": 0,
229-
"maxConcurrentWrites": 2,
229+
"maxConcurrentWrites": 16,
230230
"disableFsync": false,
231231
"blockPullOrder": "standard",
232232
"copyRangeMethod": "standard",

‎rest/system-connections-get.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ GET /rest/system/connections
22
============================
33

44

5-
.. note:: Return format changed in versions 0.13.0, 1.19.0 and 1.23.0.
5+
.. note:: Return format changed in versions 0.13.0, 0.14.14, 1.2.0, 1.19.0, 1.23.0 and 1.25.0.
66

77

88
Returns the list of configured devices and some metadata associated
9-
with them. The list also contains the local device itself as not connected.
9+
with them.
1010

11-
The connection types are ``TCP (Client)``, ``TCP (Server)``, ``Relay (Client)`` and ``Relay (Server)``.
11+
The connection types are ``tcp-client``, ``tcp-server``, ``relay-client``, ``relay-server``, ``quic-client`` and ``quic-server``.
1212

1313
.. code-block:: json
1414
@@ -48,7 +48,7 @@ The connection types are ``TCP (Client)``, ``TCP (Server)``, ``Relay (Client)``
4848
"outBytesTotal": 550,
4949
"paused": false,
5050
"startedAt": "2015-11-07T00:09:47Z",
51-
"type": "TCP (Client)"
51+
"type": "tcp-client"
5252
}
5353
},
5454
"total": {

‎thanks.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Jakob Borg (calmh), Tomasz Wilczyński, Audrius Butkevicius, André Colomb (acolomb), Adam Piggott (ProactiveServices), Simon Frei (imsodin), Stefan Tatschner (rumpelsepp), Syncthing Release Automation, Ross Smith II, Lode Hoste (Zillode), Max, Jerry Jacobs (xor-gate), Marcus B Spencer, JohnVeness, Lars K.W. Gohlke (lkwg82), Nate Morrison (nrm21), Stefan Kuntz (Stefan-Code), Antony Male (canton7), Scott Klupfel (kluppy), bt90, Martchus, Alexandre Viau (aviau), Marc Laporte, camoz, Cedric Staniewski (xduugu), Otto Jongerius, Tom Hale, raferobinson, Peter Kaminski, Peter Gervai, Andrey D (scienmind), Austin S. Hemmelgarn, Peter Badida, Emil Lundberg, novoid, sa3dany, Salim B, Matt Sieren, Brian, Scott Hansen, bugith, C Bhushan, Matt Burke (burkemw3), Matic Potočnik, Stephen, Catfriend1, alex2108, Martin Lazarov, Pierre-Alain TORET, Alex Chan, Tommy van der Vorst, Majed Abdulaziz (majedev), Louis Sautier, Unrud, Leo Arias (elopio), Laurent Etiemble (letiemble), Valerii Hiora, Daniel Clay Smith, Ken Marsh, Wulf Weich (wweich), jodusnodus, Jesse Lucas, DavidFair, 93-infinity, zertrin, Iliyan, hlovdal, Gal Szkolnik, Frank Sachsenheim, Evgeny Kuznetsov, Eric P, krmathis, Morphy99, Edd Barrett, Ethan, Duncan Smart, fejese, Felix Ableitner (Nutomic), fferrann, Filip Harald, Francois-Xavier Gsell (zukoo), Frank Harper, Dominik Schrempf, Function-10, djtm, Gavrilov Aleksej, Girish Ramakrishnan, graboluk, Gusted, Göran Roseen, Heiko Zuerker (Smiley73), dinosore, Ian Sullivan, digital, iTob191, Ivan Vyshnevskyi, dertalai, Jakob Egger, James Hartshorn, Jason, Jason Lingohr, jbratu, Jean-Denis Vauguet, Jeroen Evens, Dennis Gaida, David Rimmer (dinosore), Jimmy Jones, Jip-Hop, Jo Wouters, Dave Holland, John Buckley, Johnny Rock, Daniel O'Connor, Jonathan Cross, Jonathan Vasquez, JsBergbau, jtagcat, ka7, kaitlyn, Karol Pucyński, Kelong Cong (kc1212), Daniel Krol, Kiryuu Sakuya, Kramoule, 2nv2u, Kyle Manna, dan2468, Dan Dascalescu, Dakota, Leo Famulari, Linger206, Liu Siyuan (liusy182), daftaupe, cron410, Luni, Cromefire\_, Cristian Mircea Messel, Marcin Orlowski, Marco Köpcke, marco-m, Cory Salveson, Mariano Rodríguez, Marius Volkhart, cmillsa2, Martin Freund, Christian Kellermann, Martin Michlmayr, Marwâne Chahed, Cameron Steffen, calvin ardi, Matt Kantor, Boris Rybalkin, Matthew Davis, Matthew Harris, Matthias Braun, bitinerant, Michael Vorburger ⛑️, Mike Nolta, MikeLund, Mingwei Samuel, eddsalkield, Moviuro, MrChenWithCapsule, mseravalli, bigscoop, NCDanielH, ngirard, NickPyz, Nico Stapelbroek, Nicolas Perraut, bestlibre, nware-lab, Oliver Freyermuth, Ooker, Oskar Okuno, Benjamin Schmid, Pander, Paul Donald, Paweł Woźniak, Benjamin Masters, Peter Butkovic, Peter Dave Hello, Arthur Lutz, arneko, Phil Davis, Antoni Sawicki, Pitxyoki, Quentin Hibon, André-Patrick Bubel, Rahmi Pruitt, Rajshekhar K, realtobman, Reto Kaiser, RichardUUU, Rikiub%, rollbrettler, Romain Gay, Andrew Colin Kissa, rrosini, Andrej Shadura, Andreas Gohr, Samuel Li, Samuel Smoker, Sanjeev Gupta, sapient\_cogbag, schnappijedi, Andreas Deininger, Anderson Mesquita (andersonvom), Sergio Livi, Anatoli Babenia, sliterok, Stefaan Ghysels, alexvoda, Alexandre Maurer, StefanKopieczek, Stefano Probst, Alexander Graf (alex2108), Alexander Baumann, Sébastien Wains, Sébastien WENSKE, Tamás Sallai, terrycloth, terzinnorbert, theincogtion, Thomas Dalichow, Thomas De Rocker, Thovthe, Tim Abell, Tim Boudreau, Tobbe, Tobi, Alex Scammon, Alex Gorichev, AJ ONeal, tuathail, twomice, Tyler Kropp, uglygus, Adrian Rudnik, abdeoliveira, Vincent Ardern, Vincent Rischmann, Vium, Wieland Hoffmann, Willem Oosting, Wojciech Geisler, Abdelrahman Abdelhafez, Yakov Litvin, 4cdn, zocker-160
1+
Jakob Borg (calmh), Tomasz Wilczyński, Audrius Butkevicius, André Colomb (acolomb), Adam Piggott (ProactiveServices), Simon Frei (imsodin), Stefan Tatschner (rumpelsepp), Syncthing Release Automation, Ross Smith II, Lode Hoste (Zillode), Max, Jerry Jacobs (xor-gate), Marcus B Spencer, JohnVeness, Lars K.W. Gohlke (lkwg82), Nate Morrison (nrm21), Stefan Kuntz (Stefan-Code), Antony Male (canton7), Scott Klupfel (kluppy), bt90, Martchus, Alexandre Viau (aviau), Marc Laporte, camoz, Cedric Staniewski (xduugu), Otto Jongerius, Tom Hale, raferobinson, Peter Kaminski, Peter Gervai, Andrey D (scienmind), Austin S. Hemmelgarn, Peter Badida, Emil Lundberg, novoid, sa3dany, Salim B, Matt Sieren, Brian, Scott Hansen, bugith, C Bhushan, Matt Burke (burkemw3), Matic Potočnik, Stephen, Catfriend1, alex2108, Martin Lazarov, Pierre-Alain TORET, Alex Chan, Tommy van der Vorst, Majed Abdulaziz (majedev), Louis Sautier, Unrud, Leo Arias (elopio), Laurent Etiemble (letiemble), Valerii Hiora, Ken Marsh, Daniel Clay Smith, Wulf Weich (wweich), jodusnodus, Jesse Lucas, 93-infinity, DavidFair, zertrin, Iliyan, hlovdal, Gal Szkolnik, Frank Sachsenheim, Evgeny Kuznetsov, Eric P, Kramoule, Mingwei Samuel, Edd Barrett, Duncan Smart, Ethan, Dominik Schrempf, fejese, Felix Ableitner (Nutomic), fferrann, Filip Harald, Francois-Xavier Gsell (zukoo), Frank Harper, djtm, Function-10, dinosore, Gavrilov Aleksej, Girish Ramakrishnan, graboluk, Gusted, Göran Roseen, Heiko Zuerker (Smiley73), digital, Ian Sullivan, dertalai, iTob191, Ivan Vyshnevskyi, Dennis Gaida, Jakob Egger, James Hartshorn, Jason, Jason Lingohr, jbratu, Jean-Denis Vauguet, Jeroen Evens, David Rimmer (dinosore), Dave Holland, Jimmy Jones, Jip-Hop, Jo Wouters, Daniel O'Connor, John Buckley, Johnny Rock, Daniel Krol, Jonathan Cross, Jonathan Vasquez, JsBergbau, jtagcat, ka7, kaitlyn, Karol Pucyński, Kelong Cong (kc1212), dan2468, Kiryuu Sakuya, 2nv2u, krmathis, Kyle Manna, Dan Dascalescu, Dakota, daftaupe, Leo Famulari, Linger206, Liu Siyuan (liusy182), cron410, Cromefire\_, Luni, Cristian Mircea Messel, Cory Salveson, Marcin Orlowski, Marco Köpcke, marco-m, cmillsa2, Mariano Rodríguez, Marius Volkhart, Christian Kellermann, Martin Freund, chaosORCHESTRA, Martin Michlmayr, Marwâne Chahed, Cameron Steffen, calvin ardi, Matt Kantor, Boris Rybalkin, Matthew Davis, Matthew Harris, Matthias Braun, bitinerant, Michael Vorburger ⛑️, Mike Nolta, MikeLund, eddsalkield, Morphy99, Moviuro, MrChenWithCapsule, mseravalli, bigscoop, NCDanielH, ngirard, NickPyz, Nico Stapelbroek, Nicolas Perraut, bestlibre, nware-lab, Oliver Freyermuth, Ooker, Oskar Okuno, Benjamin Schmid, Pander, Paul Donald, Paweł Woźniak, Benjamin Masters, Peter Butkovic, Peter Dave Hello, Arthur Lutz, arneko, Phil Davis, Antoni Sawicki, Pitxyoki, Quentin Hibon, André-Patrick Bubel, Rahmi Pruitt, Rajshekhar K, realtobman, Reto Kaiser, RichardUUU, Rikiub%, rollbrettler, Romain Gay, Andrew Colin Kissa, rrosini, Andrej Shadura, Andreas Gohr, Samuel Li, Samuel Smoker, Sanjeev Gupta, sapient\_cogbag, schnappijedi, Andreas Deininger, Anderson Mesquita (andersonvom), Sergio Livi, Anatoli Babenia, sliterok, Stefaan Ghysels, alexvoda, Alexandre Maurer, StefanKopieczek, Stefano Probst, Alexander Graf (alex2108), Alexander Baumann, Sébastien Wains, Sébastien WENSKE, Tamás Sallai, terrycloth, terzinnorbert, theincogtion, Thomas Dalichow, Thomas De Rocker, Thovthe, Tim Abell, Tim Boudreau, Tobbe, Tobi, Alex Scammon, Alex Gorichev, AJ ONeal, tuathail, twomice, Tyler Kropp, uglygus, Adrian Rudnik, abdeoliveira, Vincent Ardern, Vincent Rischmann, Vium, Wieland Hoffmann, Willem Oosting, Wojciech Geisler, Abdelrahman Abdelhafez, Yakov Litvin, 4cdn, zocker-160

‎users/autostart.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ https://docs.microsoft.com/windows/win32/taskschd.
103103

104104
|Windows Task Scheduler Settings Screenshot|
105105

106+
.. note::
107+
108+
You should start Syncthing interactively (i.e. without relying on the Task
109+
Scheduler) at least once in order to trigger a Windows Firewall pop-up,
110+
which will ask you to allow Syncthing to access your network. This is
111+
required, e.g. if you want Syncthing to establish direct connections inside
112+
the given network, and also if you intend to access the web GUI remotely.
113+
106114
Additional configuration in Task Scheduler
107115
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
108116

‎users/config.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The following shows an example of a default configuration file (IDs will differ)
124124
<markerName>.stfolder</markerName>
125125
<copyOwnershipFromParent>false</copyOwnershipFromParent>
126126
<modTimeWindowS>0</modTimeWindowS>
127-
<maxConcurrentWrites>2</maxConcurrentWrites>
127+
<maxConcurrentWrites>16</maxConcurrentWrites>
128128
<disableFsync>false</disableFsync>
129129
<blockPullOrder>standard</blockPullOrder>
130130
<copyRangeMethod>standard</copyRangeMethod>
@@ -226,7 +226,7 @@ The following shows an example of a default configuration file (IDs will differ)
226226
<markerName>.stfolder</markerName>
227227
<copyOwnershipFromParent>false</copyOwnershipFromParent>
228228
<modTimeWindowS>0</modTimeWindowS>
229-
<maxConcurrentWrites>2</maxConcurrentWrites>
229+
<maxConcurrentWrites>16</maxConcurrentWrites>
230230
<disableFsync>false</disableFsync>
231231
<blockPullOrder>standard</blockPullOrder>
232232
<copyRangeMethod>standard</copyRangeMethod>
@@ -312,7 +312,7 @@ Folder Element
312312
<markerName>.stfolder</markerName>
313313
<copyOwnershipFromParent>false</copyOwnershipFromParent>
314314
<modTimeWindowS>0</modTimeWindowS>
315-
<maxConcurrentWrites>2</maxConcurrentWrites>
315+
<maxConcurrentWrites>16</maxConcurrentWrites>
316316
<disableFsync>false</disableFsync>
317317
<blockPullOrder>standard</blockPullOrder>
318318
<copyRangeMethod>standard</copyRangeMethod>
@@ -540,7 +540,7 @@ The following child elements may exist:
540540
.. option:: folder.maxConcurrentWrites
541541

542542
Maximum number of concurrent write operations while syncing. Increasing this might increase or
543-
decrease disk performance, depending on the underlying storage. Default is ``2``.
543+
decrease disk performance, depending on the underlying storage. Default is ``16``.
544544

545545
.. option:: folder.disableFsync
546546

@@ -1371,7 +1371,7 @@ Defaults Element
13711371
<markerName>.stfolder</markerName>
13721372
<copyOwnershipFromParent>false</copyOwnershipFromParent>
13731373
<modTimeWindowS>0</modTimeWindowS>
1374-
<maxConcurrentWrites>2</maxConcurrentWrites>
1374+
<maxConcurrentWrites>16</maxConcurrentWrites>
13751375
<disableFsync>false</disableFsync>
13761376
<blockPullOrder>standard</blockPullOrder>
13771377
<copyRangeMethod>standard</copyRangeMethod>

0 commit comments

Comments
 (0)