build: Readd systemd files to deb releases (ref #7564) (#7899)

Dockerfile.builder

@@ -6,4 +6,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	locales rubygems ruby-dev build-essential git \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& gem install --no-ri --no-rdoc fpm
+	&& gem install fpm

build.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main
@@ -149,6 +150,7 @@ var targets = map[string]target{
 			{src: "LICENSE", dst: "deb/usr/share/doc/syncthing-discosrv/LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-discosrv/AUTHORS.txt", perm: 0644},
 			{src: "man/stdiscosrv.1", dst: "deb/usr/share/man/man1/stdiscosrv.1", perm: 0644},
+			{src: "cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service", dst: "deb/lib/systemd/system/stdiscosrv.service", perm: 0644},
 			{src: "cmd/stdiscosrv/etc/linux-systemd/default", dst: "deb/etc/default/syncthing-discosrv", perm: 0644},
 			{src: "cmd/stdiscosrv/etc/firewall-ufw/stdiscosrv", dst: "deb/etc/ufw/applications.d/stdiscosrv", perm: 0644},
 		},
@@ -177,6 +179,7 @@ var targets = map[string]target{
 			{src: "LICENSE", dst: "deb/usr/share/doc/syncthing-relaysrv/LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaysrv/AUTHORS.txt", perm: 0644},
 			{src: "man/strelaysrv.1", dst: "deb/usr/share/man/man1/strelaysrv.1", perm: 0644},
+			{src: "cmd/strelaysrv/etc/linux-systemd/strelaysrv.service", dst: "deb/lib/systemd/system/strelaysrv.service", perm: 0644},
 			{src: "cmd/strelaysrv/etc/linux-systemd/default", dst: "deb/etc/default/syncthing-relaysrv", perm: 0644},
 			{src: "cmd/strelaysrv/etc/firewall-ufw/strelaysrv", dst: "deb/etc/ufw/applications.d/strelaysrv", perm: 0644},
 		},

cmd/strelaypoolsrv/auto/noassets.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build noassets
+//go:build noassets
+// +build noassets
 
 package auto
 

cmd/syncthing/openurl_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package main

cmd/syncthing/openurl_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package main

cmd/syncthing/options_others.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package main

cmd/syncthing/perfstats_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !solaris && !windows
 // +build !solaris,!windows
 
 package main

cmd/syncthing/perfstats_unsupported.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build solaris || windows
 // +build solaris windows
 
 package main

cmd/syncthing/traceback.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build go1.7
+//go:build go1.7
+// +build go1.7
 
 package main
 

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
 	golang.org/x/net v0.0.0-20210716203947-853a461950ff
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
+	golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c
 	golang.org/x/text v0.3.6
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	golang.org/x/tools v0.1.5

go.sum

@@ -612,6 +612,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c h1:Lyn7+CqXIiC+LOR9aHD6jDK+hPcmAuCfuXztd1v4w1Q=
+golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

gui/default/assets/lang/lang-bg.json

@@ -42,7 +42,7 @@
     "Available debug logging facilities:": "Достъпни улеснения при отстраняване на дефекти:",
     "Be careful!": "Внимание!",
     "Bugs": "Дефекти",
-    "Cancel": "Cancel",
+    "Cancel": "Отказ",
     "Changelog": "Дневник на промените",
     "Clean out after": "Почистване след",
     "Cleaning Versions": "Cleaning Versions",

gui/default/assets/lang/lang-ja.json

@@ -18,7 +18,7 @@
     "Advanced": "高度な設定",
     "Advanced Configuration": "高度な設定",
     "All Data": "全てのデータ",
-    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "このデバイスと共有するすべてのフォルダーはパスワードによって保護されなければならず、送信されたすべてのデータは指定したパスワードがなければ読み取れません。",
     "Allow Anonymous Usage Reporting?": "匿名で使用状況をレポートすることを許可しますか？",
     "Allowed Networks": "許可されているネットワーク",
     "Alphabetic": "アルファベット順",
@@ -38,7 +38,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動アップグレードは、安定版とリリース候補版のいずれかを選べるようになりました。",
     "Automatic upgrades": "自動アップグレード",
     "Automatic upgrades are always enabled for candidate releases.": "Automatic upgrades are always enabled for candidate releases.",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Automatically create or share folders that this device advertises at the default path.": "このデバイスが通知するデフォルトのパスで自動的にフォルダを作成、共有します。",
     "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "注意！",
     "Bugs": "バグ",
@@ -76,7 +76,7 @@
     "Deleted": "削除",
     "Deselect All": "すべて選択解除",
     "Deselect devices to stop sharing this folder with.": "このフォルダの共有を停止したいデバイスがある場合は、当該デバイスの選択を解除してください。",
-    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
+    "Deselect folders to stop sharing with this device.": "このデバイスとの共有を停止するフォルダーを選択解除します。",
     "Device": "デバイス",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "デバイス「{{name}}」 ({{address}} の {{device}}) が接続を求めています。新しいデバイスとして追加しますか？",
     "Device ID": "デバイスID",
@@ -120,7 +120,7 @@
     "Enabled": "有効",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "0以上の数 (例: 2.35) を入力し、単位を選択してください。パーセントはディスク容量全体に対する割合です。",
     "Enter a non-privileged port number (1024 - 65535).": "非特権ポート番号 (1024 - 65535) を入力してください。",
-    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "カンマ区切りのアドレス(\"tcp://ip:port\", \"tcp://host:port\")を入力するか、「dynamic」でアドレスの自動検出を行います。",
     "Enter ignore patterns, one per line.": "無視するファイル名のパターンを、一行につき一条件で入力してください。",
     "Enter up to three octal digits.": "Enter up to three octal digits.",
     "Error": "エラー",
@@ -151,7 +151,7 @@
     "GUI": "GUI",
     "GUI Authentication Password": "GUI認証パスワード",
     "GUI Authentication User": "GUI認証ユーザー名",
-    "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password",
+    "GUI Authentication: Set User and Password": "GUI認証: ユーザーとパスワードを設定",
     "GUI Listen Address": "GUI待ち受けアドレス",
     "GUI Theme": "GUIテーマ",
     "General": "一般",
@@ -164,7 +164,7 @@
     "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
     "Identification": "Identification",
     "If untrusted, enter encryption password": "信頼しない場合、暗号化パスワードを入力",
-    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "このコンピューター上の他のユーザーがSyncthingやあなたのファイルにアクセスできないようにしたい場合は、認証の設定を検討してください。",
     "Ignore": "無視",
     "Ignore Patterns": "無視するファイル名",
     "Ignore Permissions": "パーミッションを無視する",
@@ -283,7 +283,7 @@
     "Select All": "すべて選択",
     "Select a version": "バージョンを選択してください",
     "Select additional devices to share this folder with.": "このフォルダの共有に追加したいデバイスがある場合は、当該デバイスを選択してください。",
-    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
+    "Select additional folders to share with this device.": "このデバイスと共有する追加のフォルダーを選択します。",
     "Select latest version": "最も新しいバージョンを選択",
     "Select oldest version": "最も古いバージョンを選択",
     "Select the folders to share with this device.": "このデバイスと共有するフォルダーを選択してください。",
@@ -337,7 +337,7 @@
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthingが落ちているか、インターネット接続に問題があります。リトライ中です…",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "リクエストの処理に問題があるようです。問題が継続する場合、ページを更新するかSyncthingを再起動してください。",
     "Take me back": "キャンセル",
-    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "GUIアドレスはスタートアップオプションによってオーバーライドされます。ここでの変更はオーバーライドが行われている間は有効になりません。",
     "The Syncthing Authors": "The Syncthing Authors",
     "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingの管理画面が、パスワードなしで外部からアクセスできるように設定されています。",
     "The aggregated statistics are publicly available at the URL below.": "集計結果は以下のURLで公開されています。",
@@ -402,7 +402,7 @@
     "Usage reporting is always enabled for candidate releases.": "リリース候補版では常に使用状況レポートが送信されます。",
     "Use HTTPS for GUI": "GUIにHTTPSを使用する",
     "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "GUI認証のためのユーザー名/パスワードが設定されていません。設定を検討してください。",
     "Version": "バージョン",
     "Versions": "バージョン",
     "Versions Path": "古いバージョンを保存するパス",

lib/api/auto/noassets.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build noassets
+//go:build noassets
+// +build noassets
 
 package auto
 

lib/build/tags_race.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build race
+//go:build race
+// +build race
 
 package build
 

lib/connections/quic_dial.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// +build go1.14,!noquic,!go1.17
+//go:build go1.15 && !noquic
+// +build go1.15,!noquic
 
 package connections
 

lib/connections/quic_listen.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
-// +build go1.14,!noquic,!go1.17
+//go:build go1.15 && !noquic
+// +build go1.15,!noquic
 
 package connections
 

lib/connections/quic_misc.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
-// +build go1.14,!noquic,!go1.17
+//go:build go1.15 && !noquic
+// +build go1.15,!noquic
 
 package connections
 

lib/connections/quic_unsupported.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
-// +build noquic !go1.14 go1.17
+//go:build noquic || !go1.15
+// +build noquic !go1.15
 
 package connections
 

lib/dialer/control_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !solaris && !windows
 // +build !solaris,!windows
 
 package dialer

lib/dialer/control_unsupported.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build solaris
 // +build solaris
 
 package dialer

lib/dialer/control_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package dialer

lib/fs/basicfs_copy_range_copyfilerange.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

lib/fs/basicfs_copy_range_duplicateextents.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

lib/fs/basicfs_copy_range_ioctl.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

lib/fs/basicfs_copy_range_sendfile.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux || solaris
 // +build linux solaris
 
 package fs

lib/fs/basicfs_fileinfo_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

lib/fs/basicfs_lstat_broken.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build linux || android
 // +build linux android
 
 package fs

lib/fs/basicfs_lstat_regular.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !linux && !android && !windows
 // +build !linux,!android,!windows
 
 package fs

lib/fs/basicfs_lstat_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

lib/fs/basicfs_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

lib/fs/basicfs_watch.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (!solaris && !darwin) || (solaris && cgo) || (darwin && cgo)
 // +build !solaris,!darwin solaris,cgo darwin,cgo
 
 package fs

lib/fs/basicfs_watch_errors_linux.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

lib/fs/basicfs_watch_errors_others.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build !linux
 // +build !linux
 
 package fs

lib/fs/basicfs_watch_eventtypes_darwin.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build darwin && !kqueue && cgo
 // +build darwin,!kqueue,cgo
 
 package fs

lib/fs/basicfs_watch_eventtypes_fen.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build solaris && cgo
 // +build solaris,cgo
 
 package fs

lib/fs/basicfs_watch_eventtypes_inotify.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build linux
 // +build linux
 
 package fs

lib/fs/basicfs_watch_eventtypes_kqueue.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build dragonfly || freebsd || netbsd || openbsd
 // +build dragonfly freebsd netbsd openbsd
 
 package fs

lib/fs/basicfs_watch_eventtypes_other.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build !linux && !windows && !dragonfly && !freebsd && !netbsd && !openbsd && !solaris && !darwin && !cgo
 // +build !linux,!windows,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!darwin,!cgo
 
 // Catch all platforms that are not specifically handled to use the generic

lib/fs/basicfs_watch_eventtypes_readdcw.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

lib/fs/basicfs_watch_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (!solaris && !darwin) || (solaris && cgo) || (darwin && cgo)
 // +build !solaris,!darwin solaris,cgo darwin,cgo
 
 package fs

lib/fs/basicfs_watch_unsupported.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
+//go:build (solaris && !cgo) || (darwin && !cgo)
 // +build solaris,!cgo darwin,!cgo
 
 package fs

lib/fs/basicfs_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

lib/fs/basicfs_windows_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package fs

lib/fs/debug_symlink_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package fs

lib/model/folder.go

@@ -55,6 +55,7 @@ type folder struct {
 	scanTimer              *time.Timer
 	scanDelay              chan time.Duration
 	initialScanFinished    chan struct{}
+	scanScheduled          chan struct{}
 	versionCleanupInterval time.Duration
 	versionCleanupTimer    *time.Timer
 
@@ -110,6 +111,7 @@ func newFolder(model *model, fset *db.FileSet, ignores *ignore.Matcher, cfg conf
 		scanTimer:              time.NewTimer(0), // The first scan should be done immediately.
 		scanDelay:              make(chan time.Duration),
 		initialScanFinished:    make(chan struct{}),
+		scanScheduled:          make(chan struct{}, 1),
 		versionCleanupInterval: time.Duration(cfg.Versioning.CleanupIntervalS) * time.Second,
 		versionCleanupTimer:    time.NewTimer(time.Duration(cfg.Versioning.CleanupIntervalS) * time.Second),
 
@@ -204,6 +206,10 @@ func (f *folder) Serve(ctx context.Context) error {
 			l.Debugln(f, "Delaying scan")
 			f.scanTimer.Reset(next)
 
+		case <-f.scanScheduled:
+			l.Debugln(f, "Scan was scheduled")
+			f.scanTimer.Reset(0)
+
 		case fsEvents := <-f.watchChan:
 			l.Debugln(f, "Scan due to watcher")
 			err = f.scanSubdirs(fsEvents)
@@ -239,6 +245,14 @@ func (f *folder) DelayScan(next time.Duration) {
 	}
 }
 
+func (f *folder) ScheduleScan() {
+	// 1-buffered chan
+	select {
+	case f.scanScheduled <- struct{}{}:
+	default:
+	}
+}
+
 func (f *folder) ignoresUpdated() {
 	if f.FSWatcherEnabled {
 		f.scheduleWatchRestart()

lib/model/folder_recvenc.go

@@ -94,7 +94,14 @@ func (f *receiveEncryptedFolder) revert() error {
 	if iterErr != nil {
 		return iterErr
 	}
-	return batch.Flush()
+	if err := batch.Flush(); err != nil {
+		return err
+	}
+
+	// We might need to pull items if the local changes were on valid, global files.
+	f.SchedulePull()
+
+	return nil
 }
 
 func (f *receiveEncryptedFolder) revertHandleDirs(dirs []string, snap *db.Snapshot) {

lib/model/model.go

@@ -50,6 +50,7 @@ type service interface {
 	Override()
 	Revert()
 	DelayScan(d time.Duration)
+	ScheduleScan()
 	SchedulePull()                                    // something relevant changed, we should try a pull
 	Jobs(page, perpage int) ([]string, []string, int) // In progress, Queued, skipped
 	Scan(subs []string) error
@@ -2115,7 +2116,7 @@ func (m *model) SetIgnores(folder string, content []string) error {
 	runner, ok := m.folderRunners[folder]
 	m.fmut.RUnlock()
 	if ok {
-		return runner.Scan(nil)
+		runner.ScheduleScan()
 	}
 	return nil
 }

lib/osutil/atomic_unix_test.go

@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//+build !windows
+//go:build !windows
+// +build !windows
 
 // (No syscall.Umask or the equivalent on Windows)
 

lib/osutil/filenames_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 package osutil

lib/osutil/hidden_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package osutil

lib/osutil/hidden_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package osutil

lib/osutil/lowprio_linux.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !android
 // +build !android
 
 package osutil

lib/osutil/lowprio_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build (!windows && !linux) || android
 // +build !windows,!linux android
 
 package osutil

lib/osutil/rlimit_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package osutil

lib/osutil/rlimit_windows.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build windows
 // +build windows
 
 package osutil

lib/protocol/nativemodel_darwin.go

@@ -1,5 +1,6 @@
 // Copyright (C) 2014 The Protocol Authors.
 
+//go:build darwin
 // +build darwin
 
 package protocol

lib/protocol/nativemodel_unix.go

@@ -1,5 +1,6 @@
 // Copyright (C) 2014 The Protocol Authors.
 
+//go:build !windows && !darwin
 // +build !windows,!darwin
 
 package protocol

lib/protocol/nativemodel_windows.go

@@ -1,5 +1,6 @@
 // Copyright (C) 2014 The Protocol Authors.
 
+//go:build windows
 // +build windows
 
 package protocol

lib/syncthing/superuser_unix.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !windows
 // +build !windows
 
 package syncthing

lib/upgrade/upgrade_supported.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !noupgrade
 // +build !noupgrade
 
 package upgrade

lib/upgrade/upgrade_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build !noupgrade
 // +build !noupgrade
 
 package upgrade

lib/upgrade/upgrade_unsupp.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build noupgrade
 // +build noupgrade
 
 package upgrade

lib/ur/failurereporting.go

@@ -50,7 +50,7 @@ type FailureData struct {
 
 func FailureDataWithGoroutines(description string) FailureData {
 	var buf *strings.Builder
-	pprof.NewProfile("goroutine").WriteTo(buf, 1)
+	pprof.Lookup("goroutine").WriteTo(buf, 1)
 	return FailureData{
 		Description: description,
 		Goroutines:  buf.String(),

lib/ur/memsize_solaris.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build solaris
 // +build solaris
 
 package ur

lib/ur/memsize_unimpl.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build freebsd || openbsd || dragonfly
 // +build freebsd openbsd dragonfly
 
 package ur

man/stdiscosrv.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "STDISCOSRV" "1" "Jul 31, 2021" "v1" "Syncthing"
+.TH "STDISCOSRV" "1" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .SH SYNOPSIS

man/strelaysrv.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "STRELAYSRV" "1" "Jul 31, 2021" "v1" "Syncthing"
+.TH "STRELAYSRV" "1" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .SH SYNOPSIS

man/syncthing-bep.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-BEP" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .SH INTRODUCTION AND DEFINITIONS

man/syncthing-config.5

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-CONFIG" "5" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .SH SYNOPSIS
@@ -247,7 +247,7 @@ GUI.
 .B ignoredFolder
 Contains the ID of the folder that should be ignored. This folder will
 always be skipped when advertised from a remote device, i.e. this will be
-logged, but there will be no dialog about it in the web GUI.
+logged, but there will be no dialog shown in the web GUI.
 .UNINDENT
 .SH FOLDER ELEMENT
 .INDENT 0.0
@@ -291,7 +291,7 @@ element:
 .INDENT 0.0
 .TP
 .B id
-The folder ID, must be unique. (mandatory)
+The folder ID, which must be unique. (mandatory)
 .TP
 .B label
 The label of a folder is a human readable and descriptive local name. May
@@ -323,17 +323,17 @@ changes to other devices.
 .UNINDENT
 .TP
 .B rescanIntervalS
-The rescan interval, in seconds. Can be set to zero to disable when external
+The rescan interval, in seconds. Can be set to \fB0\fP to disable when external
 plugins are used to trigger rescans.
 .TP
 .B fsWatcherEnabled
-If enabled this detects changes to files in the folder and scans them.
+If set to \fBtrue\fP, this detects changes to files in the folder and scans them.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B fsWatcherDelayS
 The duration during which changes detected are accumulated, before a scan is
-scheduled (only takes effect if \fBfsWatcherEnabled\fP is true).
+scheduled (only takes effect if \fBfsWatcherEnabled\fP is set to \fBtrue\fP).
 .TP
 .B ignorePerms
 True if the folder should ignore permissions.
@@ -374,8 +374,8 @@ versioning
 .INDENT 0.0
 .TP
 .B copiers, pullers, hashers
-The number of copier, puller and hasher routines to use, or zero for the
-system determined optimum. These are low level performance options for
+The number of copier, puller and hasher routines to use, or \fB0\fP for the
+system determined optimums. These are low level performance options for
 advanced users only; do not change unless requested to or you’ve actually
 read and understood the code yourself. :)
 .TP
@@ -409,29 +409,29 @@ the 1 KB becomes known to the pulling device.
 \fBWARNING:\fP
 .INDENT 7.0
 .INDENT 3.5
-Enabling this is highly not recommended \- use at your own risk.
+Enabling this is highly discouraged \- use at your own risk. You have been warned.
 .UNINDENT
 .UNINDENT
 .sp
-When set to true, this device will pretend not to see instructions to
+When set to \fBtrue\fP, this device will pretend not to see instructions to
 delete files from other devices.
 .TP
 .B scanProgressIntervalS
-The interval with which scan progress information is sent to the GUI. Zero
-means the default value (two seconds).
+The interval in seconds with which scan progress information is sent to the GUI. Setting to \fB0\fP
+will cause Syncthing to use the default value of two.
 .TP
 .B pullerPauseS
 Tweak for rate limiting the puller when it retries pulling files. Don’t
-change these unless you know what you’re doing.
+change this unless you know what you’re doing.
 .TP
 .B maxConflicts
 The maximum number of conflict copies to keep around for any given file.
-The default, \-1, means an unlimited number. Setting this to zero disables
+The default, \fB\-1\fP, means an unlimited number. Setting this to \fB0\fP disables
 conflict copies altogether.
 .TP
 .B disableSparseFiles
-By default, blocks containing all zeroes are not written, causing files
-to be sparse on filesystems that support the concept. When set to true,
+By default, blocks containing all zeros are not written, causing files
+to be sparse on filesystems that support this feature. When set to \fBtrue\fP,
 sparse files will not be created.
 .TP
 .B disableTempIndexes
@@ -439,33 +439,33 @@ By default, devices exchange information about blocks available in
 transfers that are still in progress, which allows other devices to
 download parts of files that are not yet fully downloaded on your own
 device, essentially making transfers more torrent like. When set to
-true, such information is not exchanged for this folder.
+\fBtrue\fP, such information is not exchanged for this folder.
 .TP
 .B paused
 True if this folder is (temporarily) suspended.
 .TP
 .B weakHashThresholdPct
 Use weak hash if more than the given percentage of the file has changed. Set
-to \-1 to always use weak hash. Default value is 25.
+to \fB\-1\fP to always use weak hash. Default is \fB25\fP\&.
 .TP
 .B markerName
 Name of a directory or file in the folder root to be used as
-marker\-faq\&. Default is “.stfolder”.
+marker\-faq\&. Default is \fB\&.stfolder\fP\&.
 .TP
 .B copyOwnershipFromParent
 On Unix systems, tries to copy file/folder ownership from the parent directory (the directory it’s located in).
-Requires running Syncthing as privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
+Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
 .TP
 .B modTimeWindowS
 Allowed modification timestamp difference when comparing files for
 equivalence. To be used on file systems which have unstable
 modification timestamps that might change after being recorded
-during the last write operation. Defaults to 2 on Android when the
-folder is located on a FAT partition, and always to 0 elsewhere.
+during the last write operation. Default is \fB2\fP on Android when the
+folder is located on a FAT partition, and \fB0\fP otherwise.
 .TP
 .B maxConcurrentWrites
-Maximum number of concurrent write operations while syncing. Defaults to 2. Increasing this might increase or
-decrease disk performance, depending on the underlying storage.
+Maximum number of concurrent write operations while syncing. Increasing this might increase or
+decrease disk performance, depending on the underlying storage. Default is \fB2\fP\&.
 .UNINDENT
 .sp
 disableFsync
@@ -494,7 +494,7 @@ Available options:
 .TP
 .B standard (default):
 The blocks of a file are split into N equal continuous sequences, where N is the number of connected
-devices. Each device starts downloading it’s own sequence, after which it picks other devices
+devices. Each device starts downloading its own sequence, after which it picks other devices
 sequences at random. Provides acceptable data distribution and minimal spinning disk strain.
 .TP
 .B random:
@@ -596,10 +596,10 @@ to even if the original introducer is no longer listing the remote device as kno
 Defines which device has introduced us to this device. Used only for following de\-introductions.
 .TP
 .B certName
-The device certificate common name, if it is not the default “syncthing”.
+The device certificate’s common name, if it is not the default “syncthing”.
 .UNINDENT
 .sp
-From following child elements at least one \fBaddress\fP child must exist.
+From the following child elements at least one \fBaddress\fP child must exist.
 .INDENT 0.0
 .TP
 .B address
@@ -706,8 +706,8 @@ If not \fBtrue\fP, the GUI and API will not be started.
 .TP
 .B tls
 If set to \fBtrue\fP, TLS (HTTPS) will be enforced. Non\-HTTPS requests will
-be redirected to HTTPS. When this is set to \fBfalse\fP, TLS connections are
-still possible but it is not mandatory.
+be redirected to HTTPS. When set to \fBfalse\fP, TLS connections are
+still possible but not required.
 .TP
 .B debugging
 This enables profiling and additional debugging endpoints in the rest\-api\&.
@@ -721,10 +721,10 @@ Set the listen address. One address element must be present. Allowed address for
 .INDENT 7.0
 .TP
 .B IPv4 address and port (\fB127.0.0.1:8384\fP)
-The address and port is used as given.
+The address and port are used as given.
 .TP
 .B IPv6 address and port (\fB[::1]:8384\fP)
-The address and port is used as given. The address must be enclosed in
+The address and port are used as given. The address must be enclosed in
 square brackets.
 .TP
 .B Wildcard and port (\fB0.0.0.0:12345\fP, \fB[::]:12345\fP, \fB:12345\fP)
@@ -733,11 +733,11 @@ interfaces via both IPv4 and IPv6.
 .TP
 .B UNIX socket location (\fB/var/run/st.sock\fP)
 If the address is an absolute path it is interpreted as the path to a UNIX socket.
-(Added in v0.14.52.)
 .UNINDENT
 .TP
 .B unixSocketPermissions
-In the case that a UNIX socket location is used for \fBaddress\fP, set this to an octal to override the default permissions of the socket.
+When \fBaddress\fP is set to a UNIX socket location, set this to an octal value
+to override the default permissions of the socket.
 .TP
 .B user
 Set to require authentication.
@@ -756,8 +756,8 @@ without authorization. A warning will displayed about this setting on startup.
 The name of the theme to use.
 .TP
 .B authMode
-Authentication mode to use. If not present authentication mode (static)
-is controlled by presence of user/password fields for backward compatibility.
+Authentication mode to use. If not present, the authentication mode (static)
+is controlled by the presence of user/password fields for backward compatibility.
 .INDENT 7.0
 .TP
 .B static
@@ -792,7 +792,7 @@ LDAP server address (server:port).
 .TP
 .B bindDN
 BindDN for user authentication.
-Special %s variable should be used to pass username to LDAP.
+Special \fB%s\fP variable should be used to pass username to LDAP.
 .UNINDENT
 .sp
 transport
@@ -814,7 +814,7 @@ StartTLS connection mode.
 .INDENT 0.0
 .TP
 .B insecureSkipVerify
-Skip verification (true or false).
+Skip verification (\fBtrue\fP or \fBfalse\fP).
 .UNINDENT
 .SH OPTIONS ELEMENT
 .INDENT 0.0
@@ -878,12 +878,12 @@ The \fBoptions\fP element contains all other global configuration options.
 .TP
 .B listenAddress
 The listen address for incoming sync connections. See
-\fI\%Listen Addresses\fP for allowed syntax.
+\fI\%Listen Addresses\fP for the allowed syntax.
 .TP
 .B globalAnnounceServer
 A URI to a global announce (discovery) server, or the word \fBdefault\fP to
 include the default servers. Any number of globalAnnounceServer elements
-may be present. The syntax for non\-default entries is that of a HTTP or
+may be present. The syntax for non\-default entries is that of an HTTP or
 HTTPS URL. A number of options may be added as query options to the URL:
 \fBinsecure\fP to prevent certificate validation (required for HTTP URLs)
 and \fBid=<device ID>\fP to perform certificate pinning. The device ID to
@@ -914,7 +914,7 @@ The number of seconds to wait between each attempt to connect to currently
 unconnected devices.
 .TP
 .B relaysEnabled
-When true, relays will be connected to and potentially used for device to device connections.
+When \fBtrue\fP, relays will be connected to and potentially used for device to device connections.
 .TP
 .B relayReconnectIntervalM
 Sets the interval, in minutes, between relay reconnect attempts.
@@ -956,19 +956,19 @@ When true, the UR URL can be http instead of https, or have a self\-signed
 certificate. The default is \fBfalse\fP\&.
 .TP
 .B urInitialDelayS
-The time to wait from startup to the first usage report being sent. Allows
+The time to wait from startup for the first usage report to be sent. Allows
 the system to stabilize before reporting statistics.
 .TP
 .B restartOnWakeup
 Whether to perform a restart of Syncthing when it is detected that we are
-waking from sleep mode (i.e. a folded up laptop).
+waking from sleep mode (i.e. an unfolding laptop).
 .TP
 .B autoUpgradeIntervalH
-Check for a newer version after this many hours. Set to zero to disable
+Check for a newer version after this many hours. Set to \fB0\fP to disable
 automatic upgrades.
 .TP
 .B upgradeToPreReleases
-If true, automatic upgrades include release candidates (see
+If \fBtrue\fP, automatic upgrades include release candidates (see
 releases).
 .TP
 .B keepTemporariesH
@@ -1048,7 +1048,10 @@ as part of launching Syncthing, set this option to \fBfalse\fP\&.
 .UNINDENT
 .SS Listen Addresses
 .sp
-The following address types are accepted in sync protocol listen addresses. If you want Syncthing to listen on multiple addresses, you can either: add multiple \fB<listenAddress>\fP tags in the configuration file or enter several addresses separated by commas in the GUI.
+The following address types are accepted in sync protocol listen addresses.
+If you want Syncthing to listen on multiple addresses, you can either: add
+multiple \fB<listenAddress>\fP tags in the configuration file or enter several
+addresses separated by commas in the GUI.
 .INDENT 0.0
 .TP
 .B Default listen addresses (\fBdefault\fP)

man/syncthing-device-ids.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-DEVICE-IDS" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .sp

man/syncthing-event-api.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-EVENT-API" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .SH DESCRIPTION

man/syncthing-faq.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-FAQ" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .INDENT 0.0
@@ -348,14 +348,14 @@ known state (before disconnect or network delay) and the current state at the
 neighbour, and if there were updates, deletes, creates, conflicts, which were
 overlapping we only see the \fIlatest change\fP for a given file or directory (and
 the node where that latest change occurred). When we connect to multiple neighbours
-Syncthing decides which neighbor has the latest state, or if the states conflict
+Syncthing decides which neighbour has the latest state, or if the states conflict
 it initiates the conflict resolution procedure, which in the end results in a consistent
 up\-to\-date state with all the neighbours.
 .SS Why does Syncthing connect to this unknown/suspicious address?
 .sp
 If you see outgoing connections to odd and unexpected addresses these are
 most likely connections to relay servers\&. Relay servers
-are run by volunteers all over the world. They usually listen on port 443 or
+are run by volunteers all over the world. They usually listen on ports 443 or
 22067, though this is controlled by the user running it. You can compare the
 address you are concernced about with \fI\%the current list of active relays\fP <\fBhttps://relays.syncthing.net\fP>\&. Relays do not and can not see the data
 transmitted via them.
@@ -417,26 +417,26 @@ programs to achieve this such as \fI\%rsync\fP <\fBhttps://rsync.samba.org/\fP>
 \fI\%Unison\fP <\fBhttps://www.cis.upenn.edu/~bcpierce/unison\fP>\&.
 .SS When I do have two distinct Syncthing\-managed folders on two hosts, how does Syncthing handle moving files between them?
 .sp
-Syncthing does not specially handle this case, and most files most likely get
+Syncthing does not specially handle this case, and most files will most likely get
 re\-downloaded.
 .sp
-In detail, the behavior depends on the scan order. If you have folder A and B,
-and move files from A to B, if A gets scanned first, it will announce removal of
-the files to others who will remove the files. As you rescan B, B will
-announce addition of new files, and other peers will have nowhere to get
+In detail, the behavior depends on the scan order. If you have folders A and B,
+and move files from A to B, if A gets scanned first, it will announce the removal of
+the files to others who will then remove the files. As you rescan B, B will
+announce the addition of new files, and other peers will have nowhere to get
 them from apart from re\-downloading them.
 .sp
-If B gets rescanned first, B will announce additions first, remote
-peers will reconstruct the files (not rename, more like copy block by
-block) from A, and then as A gets rescanned remove the files from A.
+If B gets rescanned first, B will announce additions first, and remote
+peers will then reconstruct the files (not rename, more like copying block by
+block) from A, and then as A gets rescanned, it will remove the files from A.
 .sp
 A workaround would be to copy first from A to B, rescan B, wait for B to
-rebuild on remote ends, and then delete from A.
+copy the files on the remote side, and then delete from A.
 .SS Is Syncthing my ideal backup application?
 .sp
 No. Syncthing is not a great backup application because all changes to your
 files (modifications, deletions, etc.) will be propagated to all your
-devices. You can enable versioning, but we encourage the use of other tools
+devices. You can enable versioning, but we encourage you to use other tools
 to keep your data safe from your (or our) mistakes.
 .SS How can I exclude files with brackets (\fB[]\fP) in the name?
 .sp
@@ -448,13 +448,13 @@ To match an actual file \fIcalled\fP \fBq[abc]x\fP the pattern needs to “escap
 the brackets, like so: \fBq\e[abc\e]x\fP\&.
 .sp
 On Windows, escaping special characters is not supported as the \fB\e\fP
-character is used as a path separator. On the other hand, special characters
-such as \fB[\fP and \fB?\fP are not allowed in file names on Windows.
+character is used as a path separator.
 .SS How do I access the web GUI from another computer?
 .sp
 The default listening address is 127.0.0.1:8384, so you can only access the
-GUI from the same machine. This is for security reasons. Change the \fBGUI
-listen address\fP through the web UI from \fB127.0.0.1:8384\fP to
+GUI from the same machine. This is for security reasons. To access the web
+GUI from another computer, change the \fBGUI listen address\fP through the web
+UI from \fB127.0.0.1:8384\fP to
 \fB0.0.0.0:8384\fP or change the config.xml:
 .INDENT 0.0
 .INDENT 3.5
@@ -544,7 +544,7 @@ to get an idea how to do that.
 .sp
 If you use a package manager such as Debian’s apt\-get, you should upgrade
 using the package manager. If you use the binary packages linked from
-Syncthing.net, you can use Syncthing built in automatic upgrades.
+Syncthing.net, you can use Syncthing’s built\-in automatic upgrade functionality.
 .INDENT 0.0
 .IP \(bu 2
 If automatic upgrades is enabled (which is the default), Syncthing will
@@ -556,7 +556,7 @@ released. Pressing it will perform an upgrade.
 To force an upgrade from the command line, run \fBsyncthing \-upgrade\fP\&.
 .UNINDENT
 .sp
-Note that your system should have CA certificates installed which allow a
+Note that your system should have CA certificates installed which allows a
 secure connection to GitHub (e.g. FreeBSD requires \fBsudo pkg install
 ca_root_nss\fP). If \fBcurl\fP or \fBwget\fP works with normal HTTPS sites, then
 so should Syncthing.
@@ -577,7 +577,7 @@ of the command, not the package), look into the local documentation for that, it
 will almost certainly cover 100% of what you want to do.  If you don’t have
 \fBstart\-stop\-daemon\fP, there are a bunch of other software packages you could use
 to do this.  The most well known is called daemontools, and can be found in the
-standard package repositories for  almost every modern Linux distribution.
+standard package repositories for almost every modern Linux distribution.
 Other popular tools with similar functionality include S6 and the aforementioned
 runit.
 .SS How do I increase the inotify limit to get my filesystem watcher to work?
@@ -625,14 +625,14 @@ This only takes effect after a reboot. To adjust the limit immediately, run:
 .sp
 .nf
 .ft C
-sudo sh \-c \(aqecho 204800 > /proc/sys/fs/inotify/max_user_watches\(aq
+echo 204800 | sudo tee /proc/sys/fs/inotify/max_user_watches
 .ft P
 .fi
 .UNINDENT
 .UNINDENT
 .SS How do I reset the GUI password?
 .sp
-If you’ve forgotten/lost the GUI password, you can remove it by deleting the \fB<user>\fP and \fB<password>\fP XML tags from the \fB<gui>\fP block in file \fBconfig.xml\fP\&. This should be done while Syncthing is not running. The location of the file depends on OS and is described in the configuration documentation.
+If you’ve forgotten/lost the GUI password, you can remove it by deleting the \fB<user>\fP and \fB<password>\fP XML tags from the \fB<gui>\fP block in file \fBconfig.xml\fP\&. This should be done while Syncthing is not running. The location of the file depends on the OS and is described in the configuration documentation.
 .sp
 For example, the two emphasized lines below would be removed from the file.
 .INDENT 0.0

man/syncthing-globaldisco.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-GLOBALDISCO" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .SH ANNOUNCEMENTS

man/syncthing-localdisco.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-LOCALDISCO" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .SH MODE OF OPERATION

man/syncthing-networking.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-NETWORKING" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .SH ROUTER SETUP

man/syncthing-relay.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-RELAY" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .SH WHAT IS A RELAY?

man/syncthing-rest-api.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-REST-API" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .sp

man/syncthing-security.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-SECURITY" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .sp

man/syncthing-stignore.5

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-STIGNORE" "5" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .SH SYNOPSIS

man/syncthing-versioning.7

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING-VERSIONING" "7" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .sp

man/syncthing.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SYNCTHING" "1" "Jul 31, 2021" "v1" "Syncthing"
+.TH "SYNCTHING" "1" "Aug 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .SH SYNOPSIS

script/authors.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 // Generates the list of contributors in gui/index.html based on contents of

script/commit-msg.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

script/genassets.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

script/prune_mocks.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

script/transifexdl.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

script/translate.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build ignore
 // +build ignore
 
 package main

test/cli_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/conflict_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/delay_scan_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/filetype_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/http_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/ignore_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/manypeers_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/override_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/parallell_scan_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/reconnect_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/reset_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration

test/scan_test.go

@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
+//go:build integration
 // +build integration
 
 package integration