Merge branch 'syncthing:main' into main

Author: rafaeloledo

AUTHORS

@@ -126,6 +126,7 @@ Jonathan Vasquez <[email protected]>
 JsBergbau <[email protected]>
 jtagcat <[email protected]>
 ka7 <[email protected]>
+kaitlyn <[email protected]>
 Karol Pucyński <[email protected]>
 Kelong Cong (kc1212) <[email protected]> <[email protected]>
 Ken Marsh <[email protected]>

_script/go.mod

@@ -1,6 +1,6 @@
 module syncthing.net/docs
 
-go 1.20
+go 1.23.0
 
 require (
 	github.com/google/go-github/v49 v49.1.0
@@ -10,7 +10,7 @@ require (
 
 require (
 	github.com/google/go-querystring v1.1.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 )

_script/go.sum

@@ -1,18 +1,20 @@
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v49 v49.1.0 h1:LFkMgawGQ8dfzWLH/rNE0b3u1D3n6/dw7ZmrN3b+YFY=
 github.com/google/go-github/v49 v49.1.0/go.mod h1:MUUzHPrhGniB6vUKa27y37likpipzG+BXXJbG04J334=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
 golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

advanced/device-numconnections.rst

@@ -61,4 +61,8 @@ default, TCP has better priority than QUIC, so establishing a TCP connection
 will cause existing QUIC connections to be closed. Connection priorities can
 be configured.
 
-Multiple connections cannot be established over relays.
+When connected via a relay, only one connection is normally established.
+However, with some lucky timing, e.g. when attempting to reconnect after losing
+a connection, it is also possible to establish one relay connection in each
+direction, if the two devices are listening on different relays. In such a case,
+the GUI will show `1 + 1` connections.

dev/issues.rst

@@ -80,22 +80,6 @@ Each released version gets a milestone. Issues that are resolved and will be
 released as that version get added to the milestone. The release notes are
 based on the issues present in the milestone.
 
-In addition to version specific milestones there are two generic ones:
-
-Planned
-    This issue is being worked on, or will soon be worked on, by someone in
-    the core team. Expect action on it within the next few days, weeks or
-    months.
-
-Unplanned (Contributions Welcome)
-    This issue is not being worked on by the core team, and we don't plan on
-    doing so in the foreseeable future. We still consider it a valid issue
-    and welcome contributions towards resolving it.
-
-Issues lacking a milestone are currently undecided. In practice this is
-similar to Unplanned in that probably no-one is working on it, but we are
-still considering it and it may end up Planned or closed instead.
-
 Assignee
 --------
 

specs/bep-v1.rst

@@ -221,8 +221,9 @@ Cluster Config
 This informational message provides information about the cluster
 configuration as it pertains to the current connection. A Cluster Config
 message MUST be the first post authentication message sent on a BEP
-connection. Additional Cluster Config messages MUST NOT be sent after the
-initial exchange.
+connection. Additional Cluster Config messages MAY be sent after the initial
+exchange to change the connection in place with the update configuration. If an
+implementation does not support that, it SHOULD close the connection.
 
 Protocol Buffer Schema
 ~~~~~~~~~~~~~~~~~~~~~~

specs/relay-v1.rst

@@ -140,8 +140,11 @@ relayed between the two devices in the session directly.
 Example Exchange
 ^^^^^^^^^^^^^^^^
 
-Client A - Permanent protocol mode
-Client B - Temporary protocol mode
+Client A is the first to join the session.
+
+Client B is the second to join the session.
+
+Both are in session mode.
 
 ===  =======================  ====================== =====================
  #         Client (A)                 Relay                Client (B)

thanks.txt

@@ -1 +1 @@
-Jakob Borg (calmh), Audrius Butkevicius, Syncthing Release Automation, Stefan Tatschner (rumpelsepp), André Colomb (acolomb), Adam Piggott (ProactiveServices), Simon Frei (imsodin), Tomasz Wilczyński, Ross Smith II, Lode Hoste (Zillode), Nate Morrison (nrm21), Max, Lars K.W. Gohlke (lkwg82), JohnVeness, Jerry Jacobs (xor-gate), Scott Klupfel (kluppy), Antony Male (canton7), Marc Laporte, Marcus B Spencer, Cedric Staniewski (xduugu), Alexandre Viau (aviau), Stefan Kuntz (Stefan-Code), bt90, Matic Potočnik, Salim B, Pierre-Alain TORET, Peter Kaminski, Andrey D (scienmind), Peter Gervai, Peter Badida, alex2108, Austin S. Hemmelgarn, Otto Jongerius, novoid, Tom Hale, Alex Chan, Matt Sieren, Matt Burke (burkemw3), Brian, raferobinson, bugith, C Bhushan, sa3dany, Martin Lazarov, camoz, Catfriend1, Stephen, Martchus, Scott Hansen, Emil Lundberg, 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, krmathis, Moviuro, Edd Barrett, Duncan Smart, 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, Karol Pucyński, Kelong Cong (kc1212), dan2468, Kiryuu Sakuya, Kramoule, 2nv2u, 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, Cameron Steffen, Martin Michlmayr, Marwâne Chahed, calvin ardi, Boris Rybalkin, Matt Kantor, bitinerant, Matthew Davis, Matthew Harris, Matthias Braun, bigscoop, Michael Vorburger ⛑️, Mike Nolta, MikeLund, Mingwei Samuel, Morphy99, eddsalkield, MrChenWithCapsule, mseravalli, bestlibre, NCDanielH, ngirard, NickPyz, Nico Stapelbroek, Nicolas Perraut, Benjamin Schmid, nware-lab, Oliver Freyermuth, Ooker, Oskar Okuno, Benjamin Masters, Pander, Paul Donald, Paweł Woźniak, Arthur Lutz, Peter Butkovic, Peter Dave Hello, arneko, Antoni Sawicki, Phil Davis, André-Patrick Bubel, Pitxyoki, Quentin Hibon, Andrew Colin Kissa, Rahmi Pruitt, Rajshekhar K, realtobman, Reto Kaiser, RichardUUU, Rikiub%, rollbrettler, Romain Gay, Andrej Shadura, rrosini, Andreas Gohr, Andreas Deininger, Samuel Li, Samuel Smoker, Sanjeev Gupta, sapient\_cogbag, schnappijedi, Anderson Mesquita (andersonvom), Anatoli Babenia, Sergio Livi, alexvoda, sliterok, Stefaan Ghysels, Alexandre Maurer, Alexander Graf (alex2108), StefanKopieczek, Stefano Probst, Alexander Baumann, Alex Scammon, Sébastien Wains, Sébastien WENSKE, Tamás Sallai, terrycloth, terzinnorbert, theincogtion, Thomas Dalichow, Thovthe, Tim Abell, Tim Boudreau, Tobbe, Tobi, Alex Gorichev, AJ ONeal, Tommy van der Vorst, 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
+Jakob Borg (calmh), Audrius Butkevicius, Tomasz Wilczyński, 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, Moviuro, Edd Barrett, 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, Morphy99, eddsalkield, 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, 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/config.rst

@@ -503,8 +503,8 @@ The following child elements may exist:
 .. option:: folder.maxConflicts
 
     The maximum number of conflict copies to keep around for any given file.
-    The default, ``-1``, means an unlimited number. Setting this to ``0`` disables
-    conflict copies altogether.
+    The default is ``10``. ``-1``, means an unlimited number.
+    Setting this to ``0`` disables conflict copies altogether.
 
 .. option:: folder.disableSparseFiles
 
@@ -531,8 +531,9 @@ The following child elements may exist:
 
 .. option:: folder.markerName
 
-    Name of a directory or file in the folder root to be used as
-    :ref:`marker-faq`. Default is ``.stfolder``.
+    Name of a directory or file in the folder root to be used as a marker - see
+    :ref:`marker FAQ <marker-faq>` for its purpose.
+    A marker directory is only created by Syncthing for the default ``.stfolder``, not otherwise.
 
 .. option:: folder.copyOwnershipFromParent
 
@@ -1349,6 +1350,21 @@ The ``options`` element contains all other global configuration options.
     connections.  The mechanism is described in detail in a :doc:`separate
     chapter </advanced/option-connection-limits>`.
 
+.. option:: options.auditEnabled
+
+    When ``true``, analogous to :option:`--audit` being set.
+    Defaults to ``false``.
+
+    When either this option, or :option:`--audit` (or both) are enabled,
+    auditing is enabled.
+
+.. option:: options.auditFile
+
+    Analogous to :option:`--auditfile`. Defaults to being unset.
+
+    For compatibility reasons, if both this option and :option:`--auditfile`
+    are set, :option:`--auditfile` takes priority.
+
 Defaults Element
 ----------------
 

users/contrib.rst

@@ -33,14 +33,19 @@ We currently don't have any actively updated Windows-specific GUI wrappers here.
 
 .. seealso:: :ref:`Cross-platform GUI Wrappers <contrib-all>`.
 
-macOS
-~~~~~
+macOS / iOS
+~~~~~~~~~~~
 
 - `syncthing-macos <https://github.com/syncthing/syncthing-macos>`_
 
   syncthing-macos is a native macOS Syncthing tray application bundle.
   It hosts and wraps Syncthing, making it behave more like a native macOS application and less like a command-line utility with a web browser interface.
 
+- `Synctrain <https://github.com/pixelspark/sushitrain>`_
+
+  Synctrain is an open source, native app for iOS, iPadOS and macOS that combines Syncthing with a file-centered UI with focus on selective and on-demand file synchronization.
+  It can be installed from the `App Store <https://apps.apple.com/app/synctrain/id6553985316>`_.
+
 Linux
 ~~~~~
 
@@ -133,12 +138,12 @@ For Fedora Syncthing is now in the official repo : https://src.fedoraproject.org
 
 Unofficial `RPM repo of Syncthing <https://copr.fedorainfracloud.org/coprs/daftaupe/syncthing/>`_ (`sources <https://gitlab.com/daftaupe/syncthing-rpm>`_)
 
-ArchLinux
-~~~~~~~~~
+Arch Linux
+~~~~~~~~~~
 
-- Official Community Repository: `syncthing <https://archlinux.org/packages/?name=syncthing>`__
+- Official Extra Repository: `syncthing <https://archlinux.org/packages/?name=syncthing>`__
 
-- Arch User Repository: `syncthingtray <https://aur.archlinux.org/packages/syncthingtray>`__
+- Arch User Repository: `syncthingtray-qt6 <https://aur.archlinux.org/packages/syncthingtray-qt6>`__
 
 Docker
 ~~~~~~