diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 80a5a0ae..6b5e9b78 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -61,7 +61,7 @@ "Danger!": "Fara!", "Debugging Facilities": "Felsökningsanläggningar", "Default Folder Path": "Standard mappsökväg", - "Deleted": "Tog bort", + "Deleted": "Raderade", "Deselect All": "Avmarkera alla", "Device": "Enhet", "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) vill ansluta. Lägg till ny enhet?", @@ -109,10 +109,10 @@ "File Pull Order": "Filhämtningsprioritering", "File Versioning": "Filversionshantering", "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filrättigheter ignoreras under sökning efter förändringar. Används på FAT-filsystem.", - "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Filer flyttas till .stversions-mappen vid byte eller tas bort av Syncthing.", - "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till .stversions-mappen när de ersätts eller tas bort av Syncthing.", - "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Filer flyttas till datumstämplade versioner i en .stversions-mapp när de ersätts eller tas bort av Syncthing.", - "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions mapp när de ersätts eller tas bort av Syncthing.", + "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Filer flyttas till .stversions-mappen vid byte eller raderas av Syncthing.", + "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till .stversions-mappen när de ersätts eller raderas av Syncthing.", + "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Filer flyttas till datumstämplade versioner i en .stversions-mapp när de ersätts eller raderas av Syncthing.", + "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions-mapp när de ersätts eller raderas av Syncthing.", "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Filer skyddas från ändringar gjorda på andra enheter, men ändringar som görs på den här noden skickas till de andra klustermedlemmarna.", "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Filer synkroniseras från klustret, men alla ändringar som görs lokalt skickas inte till andra enheter.", "Filesystem Notifications": "filsystemsnotifieringar", @@ -188,7 +188,7 @@ "Newest First": "Nyast först", "No": "Nej", "No File Versioning": "Ingen filversionshantering", - "No files will be deleted as a result of this operation.": "Inga filer kommer att tas bort till följd av denna operation.", + "No files will be deleted as a result of this operation.": "Inga filer kommer att raderas till följd av denna operation.", "No upgrades": "Inga uppgraderingar", "Normal": "Normal", "Notice": "Observera", @@ -204,7 +204,7 @@ "Path": "Sökväg", "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Sökväg till mappen på din dator. Kommer att skapas om det inte finns. Tecknet tilde (~) kan användas som en genväg för", "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Sökvägen där nya automatiskt accepterade mappar kommer att skapas, liksom den föreslagna sökvägen när du lägger till nya mappar via gränssnittet. Tecknet tilde (~) expanderar till {{tilde}}.", - "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Sökväg där versioner ska lagras (lämna tomt för standard .stversions-katalogen i den delade katalogen).", + "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Sökväg där versioner ska lagras (lämna tomt för standard .stversions-mappen i den delade katalogen).", "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sökväg där versioner sparas (lämna tomt för att använda standard .stversions-mappen i mappen).", "Pause": "Paus", "Pause All": "Pausa alla", @@ -217,7 +217,7 @@ "Please consult the release notes before performing a major upgrade.": "Läs igenom versionsnyheterna innan den stora uppgraderingen.", "Please set a GUI Authentication User and Password in the Settings dialog.": "Ställ in ett grafiska gränssnittets användarautentisering och lösenord i inställningsdialogrutan.", "Please wait": "Var god vänta", - "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix som indikerar att filen kan raderas om det förhindrar borttagning av katalog", + "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix som indikerar att filen kan raderas om det förhindrar radering av katalog", "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix som indikerar att mönstret ska matchas utan skiftlägeskänslighet", "Preview": "Förhandsgranska", "Preview Usage Report": "Förhandsgranska statistik", @@ -356,7 +356,7 @@ "Version": "Version", "Versions": "Versioner", "Versions Path": "Sökväg för versioner", - "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner tas bort automatiskt när de är äldre än den maximala åldersgränsen eller överstiger frekvensen i intervallet.", + "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner raderas automatiskt när de är äldre än den maximala åldersgränsen eller överstiger frekvensen i intervallet.", "Waiting to scan": "Väntar på uppdatering", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Varning, denna sökväg är en överordnad mapp av en befintlig mapp \"{{otherFolder}}\".", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varning, denna sökväg är en överordnad mapp av en befintlig mapp \"{{otherFolderLabel}}\" ({{otherFolder}}).", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index f563b4be..56eebcf1 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Mar 05, 2019" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Mar 22, 2019" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . @@ -52,12 +52,12 @@ Syncthing project also maintains a global cluster for public use. .INDENT 0.0 .TP .B \-cert= -Certificate file (default "./cert.pem"). +Certificate file (default “./cert.pem”). .UNINDENT .INDENT 0.0 .TP .B \-db\-dir= -Database directory, where data is stored (default "./discovery.db"). +Database directory, where data is stored (default “./discovery.db”). .UNINDENT .INDENT 0.0 .TP @@ -72,12 +72,12 @@ Listen on HTTP (behind an HTTPS proxy). .INDENT 0.0 .TP .B \-key= -Key file (default "./key.pem"). +Key file (default “./key.pem”). .UNINDENT .INDENT 0.0 .TP .B \-listen=
-Listen address (default ":8443"). +Listen address (default “:8443”). .UNINDENT .INDENT 0.0 .TP @@ -92,14 +92,14 @@ Replication peers, \fI\%id@address\fP <\fBid@address\fP>, comma separated .INDENT 0.0 .TP .B \-replication\-listen=
-Listen address for incoming replication connections (default ":19200"). +Listen address for incoming replication connections (default “:19200”). .UNINDENT .SH POINTING SYNCTHING AT YOUR DISCOVERY SERVER .sp By default, Syncthing uses a number of global discovery servers, signified by the entry \fBdefault\fP in the list of discovery servers. To make Syncthing use -your own instance of stdiscosrv, open up Syncthing\(aqs web GUI. Go to settings, -Global Discovery Server and add stdiscosrv\(aqs host address to the comma\-separated +your own instance of stdiscosrv, open up Syncthing’s web GUI. Go to settings, +Global Discovery Server and add stdiscosrv’s host address to the comma\-separated list, e.g. \fBhttps://disco.example.com:8443/\fP\&. Note that stdiscosrv uses port 8443 by default. For stdiscosrv to be available over the internet with a dynamic IP address, you will need a dynamic DNS service. @@ -114,7 +114,7 @@ entry from the list. .SS Description .sp This guide assumes that you have already set up Syncthing. If you -haven\(aqt yet, head over to getting\-started first. +haven’t yet, head over to getting\-started first. .SS Installing .sp Go to \fI\%releases\fP <\fBhttps://github.com/syncthing/discosrv/releases\fP> and @@ -146,7 +146,7 @@ discovery server. This is like any other HTTPS website; clients will authenticate the server based on its certificate and domain name. .IP \(bu 2 Use any certificate pair and let clients authenticate the server based on -its "device ID" (similar to Syncthing\-to\-Syncthing authentication). This +its “device ID” (similar to Syncthing\-to\-Syncthing authentication). This option can be used with the certificate automatically generated by the discovery server. .IP \(bu 2 @@ -155,7 +155,7 @@ reverse proxy. See below for configuration. .UNINDENT .sp For the first two options, the discovery server must be given the paths to -the certificate and key at startup. This isn\(aqt necessary with the \fBhttp\fP flag: +the certificate and key at startup. This isn’t necessary with the \fBhttp\fP flag: .INDENT 0.0 .INDENT 3.5 .sp @@ -218,9 +218,9 @@ sender and listener. As an example, lets assume two discovery servers: .INDENT 0.0 .IP \(bu 2 -Server one is on 192.0.2.20 and has certificate ID I6K...H76 +Server one is on 192.0.2.20 and has certificate ID I6K…H76 .IP \(bu 2 -Server two is on 192.0.2.55 and has certificate ID MRI...7OK +Server two is on 192.0.2.55 and has certificate ID MRI…7OK .UNINDENT .sp In order for both to replicate to the other and thus form a redundant pair, @@ -257,7 +257,7 @@ port must be specified in peer addresses. .sp It is possible to only allow incoming connections from a peer without establishing an outgoing replication connection. To do so, give only the -device ID without "@ip:port" address: +device ID without “@ip:port” address: .INDENT 0.0 .INDENT 3.5 .sp @@ -270,7 +270,7 @@ $ stdiscosrv \-replicate=I6K...H76 .UNINDENT .sp Discosrv will listen on the replication port only when \fB\-replicate\fP is -given. The default replication listen address is ":19200". +given. The default replication listen address is “:19200”. .sp To achieve load balancing over two mutually replicating discovery server instances, add multiple A / AAAA DNS records for a given name and point @@ -293,10 +293,10 @@ Run the discovery server using the \-http flag \fBstdiscosrv \-http\fP\&. .IP \(bu 2 SSL certificate/key configured for the reverse proxy .IP \(bu 2 -The "X\-Forwarded\-For" http header must be passed through with the client\(aqs +The “X\-Forwarded\-For” http header must be passed through with the client’s real IP address .IP \(bu 2 -The "X\-SSL\-Cert" must be passed through with the PEM\-encoded client SSL +The “X\-SSL\-Cert” must be passed through with the PEM\-encoded client SSL certificate .IP \(bu 2 The proxy must request the client SSL certificate but not require it to be @@ -371,7 +371,7 @@ server { .UNINDENT .sp An example of automating the SSL certificates and reverse\-proxying the Discovery -Server and Syncthing using Nginx, \fI\%Let\(aqs Encrypt\fP <\fBhttps://letsencrypt.org/\fP> and Docker can be found \fI\%here\fP <\fBhttps://forum.syncthing.net/t/docker-syncthing-and-syncthing-discovery-behind-nginx-reverse-proxy-with-lets-encrypt/6880\fP>\&. +Server and Syncthing using Nginx, \fI\%Let’s Encrypt\fP <\fBhttps://letsencrypt.org/\fP> and Docker can be found \fI\%here\fP <\fBhttps://forum.syncthing.net/t/docker-syncthing-and-syncthing-discovery-behind-nginx-reverse-proxy-with-lets-encrypt/6880\fP>\&. .SH SEE ALSO .sp \fBsyncthing\-networking(7)\fP, \fBsyncthing\-faq(7)\fP diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 6fb232fd..aec8cd11 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Mar 05, 2019" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Mar 22, 2019" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . @@ -72,12 +72,12 @@ Global rate limit, in bytes/s. .INDENT 0.0 .TP .B \-keys= -Directory where cert.pem and key.pem is stored (default "."). +Directory where cert.pem and key.pem is stored (default “.”). .UNINDENT .INDENT 0.0 .TP .B \-listen= -Protocol listen address (default ":22067"). +Protocol listen address (default “:22067”). .UNINDENT .INDENT 0.0 .TP @@ -127,13 +127,13 @@ How often pings are sent (default 1m0s). .TP .B \-pools= Comma separated list of relay pool addresses to join (default -"\fI\%http://relays.syncthing.net/endpoint\fP"). Blank to disable announcement to +“\fI\%http://relays.syncthing.net/endpoint\fP”). Blank to disable announcement to a pool, thereby remaining a private relay. .UNINDENT .INDENT 0.0 .TP .B \-protocol= -Protocol used for listening. \(aqtcp\(aq for IPv4 and IPv6, \(aqtcp4\(aq for IPv4, \(aqtcp6\(aq for IPv6 (default "tcp"). +Protocol used for listening. ‘tcp’ for IPv4 and IPv6, ‘tcp4’ for IPv4, ‘tcp6’ for IPv6 (default “tcp”). .UNINDENT .INDENT 0.0 .TP @@ -143,7 +143,7 @@ An optional description about who provides the relay. .INDENT 0.0 .TP .B \-status\-srv= -Listen address for status service (blank to disable) (default ":22070"). +Listen address for status service (blank to disable) (default “:22070”). Status service is used by the relay pool server UI for displaying stats (data transfered, number of clients, etc.) .UNINDENT .SH SETTING UP @@ -191,7 +191,7 @@ relay://private\-relay\-1.example.com:443/?id=ITZRNXE\-YNROGBZ\-HXTH5P7\-VK5NYE5 .UNINDENT .UNINDENT .sp -The relay\(aqs device ID is output on start\-up. +The relay’s device ID is output on start\-up. .SS Running on port 443 as an unprivileged user .sp It is recommended that you run the relay on port 443 (or another port which is @@ -213,7 +213,7 @@ iptables \-t nat \-A PREROUTING \-i eth0 \-p tcp \-\-dport 443 \-j REDIRECT \-\- .UNINDENT .UNINDENT .sp -Or, if you\(aqre using \fBufw\fP, add the following to \fB/etc/ufw/before.rules\fP: +Or, if you’re using \fBufw\fP, add the following to \fB/etc/ufw/before.rules\fP: .INDENT 0.0 .INDENT 3.5 .sp diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 4d2faff4..3444b534 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Mar 05, 2019" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Mar 22, 2019" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . @@ -46,8 +46,8 @@ File data is described and transferred in units of \fIblocks\fP, each being from block size may vary between files but is constant in any given file, except for the last block which may be smaller. .sp -The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", -"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this +The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, +“SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in RFC 2119. .SH TRANSPORT AND AUTHENTICATION .sp @@ -72,8 +72,8 @@ v ... v .UNINDENT .sp The encryption and authentication layer SHALL use TLS 1.2 or a higher -revision. A strong cipher suite SHALL be used, with "strong cipher -suite" being defined as being without known weaknesses and providing +revision. A strong cipher suite SHALL be used, with “strong cipher +suite” being defined as being without known weaknesses and providing Perfect Forward Secrecy (PFS). Examples of strong cipher suites are given at the end of this document. This is not to be taken as an exhaustive list of allowed cipher suites but represents best practices @@ -85,7 +85,7 @@ connection. Possibilities include certificates signed by a common trusted CA, preshared certificates, preshared certificate fingerprints or certificate pinning combined with some out of band first verification. The reference implementation uses preshared certificate -fingerprints (SHA\-256) referred to as "Device IDs". +fingerprints (SHA\-256) referred to as “Device IDs”. .sp There is no required order or synchronization among BEP messages except as noted per message type \- any message type may be sent at any time and @@ -94,9 +94,9 @@ another. .sp The underlying transport protocol MUST guarantee reliable packet delivery. .sp -In this document, in diagrams and text, "bit 0" refers to the \fImost -significant\fP bit of a word; "bit 15" is thus the least significant bit of a -16 bit word (int16) and "bit 31" is the least significant bit of a 32 bit +In this document, in diagrams and text, “bit 0” refers to the \fImost +significant\fP bit of a word; “bit 15” is thus the least significant bit of a +16 bit word (int16) and “bit 31” is the least significant bit of a 32 bit word (int32). Non protocol buffer integers are always represented in network byte order (i.e., big endian) and are signed unless stated otherwise, but when describing message lengths negative values do not make sense and the @@ -109,7 +109,7 @@ message is \fIvalid\fP with all fields empty \- for example, an index entry for file that does not have a name is not useful and MAY be rejected by the implementation. However the folder label is for human consumption only so an empty label should be accepted \- the implementation will have to choose some -way to represent the folder, perhaps by using the ID in it\(aqs place or +way to represent the folder, perhaps by using the ID in it’s place or automatically generating a label. .SH PRE-AUTHENTICATION MESSAGES .sp @@ -171,7 +171,7 @@ name or host name, for the remote device. The \fBclient_name\fP and \fBclient_version\fP identifies the implementation. The values SHOULD be simple strings identifying the implementation name, as a user would expect to see it, and the version string in the same manner. An -example client name is "syncthing" and an example client version is "v0.7.2". +example client name is “syncthing” and an example client version is “v0.7.2”. The client version field SHOULD follow the patterns laid out in the \fI\%Semantic Versioning\fP <\fBhttp://semver.org/\fP> standard. .sp @@ -467,7 +467,7 @@ The \fBfiles\fP field is a list of files making up the index information. The \fBname\fP is the file name path relative to the folder root. Like all strings in BEP, the Name is always in UTF\-8 NFC regardless of operating system or file system specific conventions. The name field uses the slash -character ("/") as path separator, regardless of the implementation\(aqs +character (“/”) as path separator, regardless of the implementation’s operating system conventions. The combination of folder and name uniquely identifies each file in a cluster. .sp @@ -532,7 +532,7 @@ symlink type. It is empty for all other entry types. .SS Request .sp The Request message expresses the desire to receive a data block -corresponding to a part of a certain file in the peer\(aqs folder. +corresponding to a part of a certain file in the peer’s folder. .SS Protocol Buffer Schema .INDENT 0.0 .INDENT 3.5 @@ -569,7 +569,7 @@ requested hash. The other device MAY reuse a block from a different file and offset having the same size and hash, if one exists. .sp The \fBfrom temporary\fP field is set to indicate that the read should be -performed from the temporary file (converting name to it\(aqs temporary form) +performed from the temporary file (converting name to it’s temporary form) and falling back to the non temporary file if any error occurs. Knowledge of contents of temporary files comes from DownloadProgress messages. .SS Response @@ -812,7 +812,7 @@ index data. For situations with large indexes or frequent reconnects this can be quite inefficient. A mechanism can then be used to retain index data between connections and only transmit any changes since that data on connection -start. This is called "delta indexes". To enable this mechanism the +start. This is called “delta indexes”. To enable this mechanism the \fBsequence\fP and \fBindex ID\fP fields are used. .INDENT 0.0 .TP @@ -861,7 +861,7 @@ Update messages rather than sending a very large Index message. The Syncthing implementation imposes a hard limit of 500,000,000 bytes on all messages. Attempting to send or receive a larger message will result in a connection close. This size was chosen to accommodate Index messages -containing a large block list. It\(aqs intended that the limit may be further +containing a large block list. It’s intended that the limit may be further reduced in a future protocol update supporting variable block sizes (and thus shorter block lists for large files). .SH SELECTION OF BLOCK SIZE @@ -1049,7 +1049,7 @@ T} T{ T} _ T{ -\&... +… T} T{ T} T{ T} diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index bfa01aa8..149731ce 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Mar 05, 2019" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Mar 22, 2019" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . @@ -58,7 +58,7 @@ directory the following files are located: The configuration file, in XML format. .TP .B \fBcert.pem\fP, \fBkey.pem\fP -The device\(aqs RSA public and private key. These form the basis for the +The device’s RSA public and private key. These form the basis for the device ID. The key must be kept private. .TP .B \fBhttps\-cert.pem\fP, \fBhttps\-key.pem\fP @@ -257,17 +257,17 @@ Controls how the folder is handled by Syncthing. Possible values are: .TP .B sendreceive The folder is in default mode. Sending local and accepting remote changes. -Note that this type was previously called "readwrite" which is deprecated +Note that this type was previously called “readwrite” which is deprecated but still accepted in incoming configs. .TP .B sendonly -The folder is in "send only" mode \-\- it will not be modified by +The folder is in “send only” mode – it will not be modified by Syncthing on this device. -Note that this type was previously called "readonly" which is deprecated +Note that this type was previously called “readonly” which is deprecated but still accepted in incoming configs. .TP .B receiveonly -The folder is in "receive only" mode \-\- it will not propagate +The folder is in “receive only” mode – it will not propagate changes to other devices. .UNINDENT .TP @@ -325,7 +325,7 @@ versioning .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 -advanced users only; do not change unless requested to or you\(aqve actually +advanced users only; do not change unless requested to or you’ve actually read and understood the code yourself. :) .TP .B order @@ -362,8 +362,8 @@ The interval with which scan progress information is sent to the GUI. Zero means the default value (two seconds). .TP .B pullerPauseS -Tweak for rate limiting the puller when it retries pulling files. Don\(aqt -change these unless you know what you\(aqre doing. +Tweak for rate limiting the puller when it retries pulling files. Don’t +change these unless you know what you’re doing. .TP .B maxConflicts The maximum number of conflict copies to keep around for any given file. @@ -389,7 +389,7 @@ to \-1 to always use weak hash. Default value is 25. .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 “.stfolder”. .TP .B fsync Deprecated since version v0.14.37. @@ -402,8 +402,8 @@ committing the changes to the internal database. Deprecated since version v0.14.41. .sp -Tweak for rate limiting the puller. Don\(aqt change these unless you know -what you\(aqre doing. +Tweak for rate limiting the puller. Don’t change these unless you know +what you’re doing. .UNINDENT .SH DEVICE ELEMENT .INDENT 0.0 @@ -478,7 +478,7 @@ 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 common name, if it is not the default “syncthing”. .UNINDENT .sp From following child elements at least one \fBaddress\fP child must exist. @@ -967,9 +967,9 @@ that the files you are backing up are in a folder\-sendonly to prevent other devices from overwriting the per device configuration. The folder on the remote device(s) should not be used as configuration for the remote devices. .sp -If you\(aqd like to sync your home folder in non\-send only mode, you may add the +If you’d like to sync your home folder in non\-send only mode, you may add the folder that stores the configuration files to the ignore list\&. -If you\(aqd also like to backup your configuration files, add another folder in +If you’d also like to backup your configuration files, add another folder in send only mode for just the configuration folder. .SH AUTHOR The Syncthing Authors diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index c659d130..911885d2 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" "Mar 05, 2019" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Mar 22, 2019" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . @@ -32,8 +32,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .. .sp Every device is identified by a device ID. The device ID is used for address -resolution, authentication and authorization. The term "device ID" could -interchangeably have been "key ID" since the device ID is a direct property of +resolution, authentication and authorization. The term “device ID” could +interchangeably have been “key ID” since the device ID is a direct property of the public key in use. .SH KEYS .sp @@ -43,7 +43,7 @@ startup, Syncthing will create a public/private keypair. Currently this is a 384 bit ECDSA key (3072 bit RSA prior to v0.12.5, which is what is used as an example in this article). The keys are saved in the form of the private key (\fBkey.pem\fP) and a self signed certificate -(\fBcert.pem\fP). The self signing part doesn\(aqt actually add any security or +(\fBcert.pem\fP). The self signing part doesn’t actually add any security or functionality as far as Syncthing is concerned but it enables the use of the keys in a standard TLS exchange. .sp @@ -94,7 +94,7 @@ Certificate: .sp We can see here that the certificate is little more than a container for the public key; the serial number is zero and the Issuer and Subject are both -"syncthing" where a qualified name might otherwise be expected. +“syncthing” where a qualified name might otherwise be expected. .sp An advanced user could replace the \fBkey.pem\fP and \fBcert.pem\fP files with a keypair generated directly by the \fBopenssl\fP utility or other mechanism. @@ -138,7 +138,7 @@ MFZWI3D\-BONSGYC\-YLTMRWG\-C43ENR5\-QXGZDMM\-FZWI3DP\-BONSGYY\-LTMRWAD .UNINDENT .SS Connection Establishment .sp -Now we know what device IDs are, here\(aqs how they are used in Syncthing. When +Now we know what device IDs are, here’s how they are used in Syncthing. When you add a device ID to the configuration, Syncthing will attempt to connect to that device. The first thing we need to do is figure out the IP and port to connect to. There are three possibilities here: @@ -150,13 +150,13 @@ dynamic DNS setup this might be a good option. .IP \(bu 2 Using local discovery, if enabled. Every Syncthing instance on a LAN periodically broadcasts information about itself (device ID, address, -port number). If we\(aqve seen one of these broadcasts for a given -device ID that\(aqs where we try to connect. +port number). If we’ve seen one of these broadcasts for a given +device ID that’s where we try to connect. .IP \(bu 2 Using global discovery, if enabled. Every Syncthing instance announces itself to the global discovery service (device ID and external port number \- the internal address is not announced to the -global server). If we don\(aqt have a static address and haven\(aqt seen +global server). If we don’t have a static address and haven’t seen any local announcements the global discovery server will be queried for an address. .UNINDENT @@ -188,11 +188,11 @@ The SHA\-256 hash is cryptographically collision resistant. This means that there is no way that we know of to create two different messages with the same hash. .sp -You can argue that of course there are collisions \- there\(aqs an infinite +You can argue that of course there are collisions \- there’s an infinite amount of inputs and a finite amount of outputs \- so by definition there are infinitely many messages that result in the same hash. .sp -I\(aqm going to quote \fI\%stack +I’m going to quote \fI\%stack overflow\fP <\fBhttps://stackoverflow.com/questions/4014090/is-it-safe-to-ignore-the-possibility-of-sha-collisions-in-practice\fP> here: .INDENT 0.0 @@ -203,28 +203,28 @@ civilization\-as\-we\- know\-it, and killing off a few billion people ? It can be argued that any unlucky event with a probability lower than that is not actually very important. .sp -If we have a "perfect" hash function with output size n, and we have +If we have a “perfect” hash function with output size n, and we have p messages to hash (individual message length is not important), then probability of collision is about p2/2n+1 (this is an -approximation which is valid for "small" p, i.e. substantially +approximation which is valid for “small” p, i.e. substantially smaller than 2n/2). For instance, with SHA\-256 (n=256) and one billion messages (p=10^9) then the probability is about 4.3*10^\-60. .sp A mass\-murderer space rock happens about once every 30 million years on average. This leads to a probability of such an event occurring -in the next second to about 10^\-15. That\(aqs 45 orders of magnitude +in the next second to about 10^\-15. That’s 45 orders of magnitude more probable than the SHA\-256 collision. Briefly stated, if you find SHA\-256 collisions scary then your priorities are wrong. .UNINDENT .UNINDENT .sp -It\(aqs also worth noting that the property of SHA\-256 that we are using is not +It’s also worth noting that the property of SHA\-256 that we are using is not simply collision resistance but resistance to a preimage attack, i.e. even if -you can find two messages that result in a hash collision that doesn\(aqt help you +you can find two messages that result in a hash collision that doesn’t help you attack Syncthing (or TLS in general). You need to create a message that hashes -to exactly the hash that my certificate already has or you won\(aqt get in. +to exactly the hash that my certificate already has or you won’t get in. .sp -Note also that it\(aqs not good enough to find a random blob of bits that happen to +Note also that it’s not good enough to find a random blob of bits that happen to have the same hash as my certificate. You need to create a valid DER\-encoded, signed certificate that has the same hash as mine. The difficulty of this is staggeringly far beyond the already staggering difficulty of finding a SHA\-256 @@ -235,22 +235,22 @@ As far as I know, these are the issues or potential issues with the above mechanism. .SS Discovery Spoofing .sp -Currently, the local discovery mechanism isn\(aqt protected by crypto. This +Currently, the local discovery mechanism isn’t protected by crypto. This means that any device can in theory announce itself for any device ID and potentially receive connections for that device from the local network. .SS Long Device IDs are Painful .sp -It\(aqs a mouthful to read over the phone, annoying to type into an SMS or even +It’s a mouthful to read over the phone, annoying to type into an SMS or even into a computer. And it needs to be done twice, once for each side. .sp -This isn\(aqt a vulnerability as such, but a user experience problem. There are +This isn’t a vulnerability as such, but a user experience problem. There are various possible solutions: .INDENT 0.0 .IP \(bu 2 -Use shorter device IDs with verification based on the full ID ("You +Use shorter device IDs with verification based on the full ID (“You entered MFZWI3; I found and connected to a device with the ID MFZWI3\-DBONSG\-YYLTMR\-WGC43E\-NRQXGZ\-DMMFZW\-I3DBON\-SGYYLT\-MRWA, please -confirm that this is correct"). +confirm that this is correct”). .IP \(bu 2 Use shorter device IDs with an out of band authentication, a la Bluetooth pairing. You enter a one time PIN into Syncthing and give diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index e6011c31..20c7a5de 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" "Mar 05, 2019" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Mar 22, 2019" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . @@ -162,8 +162,8 @@ Generated each time a connection to a device has been terminated. .INDENT 0.0 .INDENT 3.5 The error key contains the cause for disconnection, which might not -necessarily be an error as such. Specifically, "EOF" and "unexpected -EOF" both signify TCP connection termination, either due to the other +necessarily be an error as such. Specifically, “EOF” and “unexpected +EOF” both signify TCP connection termination, either due to the other device restarting or going offline or due to a network change. .UNINDENT .UNINDENT diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index de929805..d0047b1e 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Mar 05, 2019" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Mar 22, 2019" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -38,10 +38,10 @@ machine will automatically be replicated to your other devices. We believe your data is your data alone and you deserve to choose where it is stored. Therefore Syncthing does not upload your data to the cloud but exchanges your data across your machines as soon as they are online at the same time. -.SH IS IT "SYNCTHING", "SYNCTHING" OR "SYNCTHING"? +.SH IS IT “SYNCTHING”, “SYNCTHING” OR “SYNCTHING”? .sp -It\(aqs \fBSyncthing\fP, although the command and source repository is spelled -\fBsyncthing\fP so it may be referred to in that way as well. It\(aqs definitely not +It’s \fBSyncthing\fP, although the command and source repository is spelled +\fBsyncthing\fP so it may be referred to in that way as well. It’s definitely not SyncThing, even though the abbreviation \fBst\fP is used in some circumstances and file names. .SH HOW DOES SYNCTHING DIFFER FROM BITTORRENT/RESILIO SYNC? @@ -116,9 +116,9 @@ in the configuration file (24 hours by default). .sp When troubleshooting a slow sync, there are a number of things to check. .sp -First of all, verify that you are not connected via a relay. In the "Remote -Devices" list on the right side of the GUI, double check that you see -"Address: " and \fInot\fP "Relay: ". +First of all, verify that you are not connected via a relay. In the “Remote +Devices” list on the right side of the GUI, double check that you see +“Address: ” and \fInot\fP “Relay: ”. [image] .sp If you are connected via a relay, this is because a direct connection could @@ -151,8 +151,8 @@ There is a certain amount of housekeeping that must be done to track the current and available versions of each file in the index database. .IP 4. 3 By default Syncthing uses periodic scanning every hour when watching for -changes or every minute if that\(aqs disabled to detect -file changes. This means checking every file\(aqs modification time and +changes or every minute if that’s disabled to detect +file changes. This means checking every file’s modification time and comparing it to the database. This can cause spikes of CPU usage for large folders. .UNINDENT @@ -169,16 +169,16 @@ To further limit the amount of CPU used when syncing and scanning, set the environment variable \fBGOMAXPROCS\fP to the maximum number of CPU cores Syncthing should use at any given moment. For example, \fBGOMAXPROCS=2\fP on a machine with four cores will limit Syncthing to no more than half the -system\(aqs CPU power. +system’s CPU power. .SH SHOULD I KEEP MY DEVICE IDS SECRET? .sp -No. The IDs are not sensitive. Given a device ID it\(aqs possible to find the IP +No. The IDs are not sensitive. Given a device ID it’s possible to find the IP address for that device, if global discovery is enabled on it. Knowing the device -ID doesn\(aqt help you actually establish a connection to that device or get a list +ID doesn’t help you actually establish a connection to that device or get a list of files, etc. .sp -For a connection to be established, both devices need to know about the other\(aqs -device ID. It\(aqs not possible (in practice) to forge a device ID. (To forge a +For a connection to be established, both devices need to know about the other’s +device ID. It’s not possible (in practice) to forge a device ID. (To forge a device ID you need to create a TLS certificate with that specific SHA\-256 hash. If you can do that, you can spoof any TLS certificate. The world is your oyster!) @@ -205,14 +205,14 @@ device where it was deleted. Beware that the \fB.sync\-conflict\-\-