From 7eacdaa11b53a17d3a34c2bbcf868c86f92f1f54 Mon Sep 17 00:00:00 2001 From: ka7 Date: Sun, 8 May 2016 11:20:20 +0200 Subject: [PATCH] spelling-fixes --- advanced/folder-ignoredelete.rst | 2 +- dev/contributing.rst | 2 +- specs/bep-v1.rst | 4 ++-- specs/globaldisco-v3.rst | 4 ++-- specs/relay-v1.rst | 2 +- users/autostart.rst | 4 ++-- users/syncing.rst | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/advanced/folder-ignoredelete.rst b/advanced/folder-ignoredelete.rst index 2cd19b80e..210bf307b 100644 --- a/advanced/folder-ignoredelete.rst +++ b/advanced/folder-ignoredelete.rst @@ -20,7 +20,7 @@ file, Bob ignores that update and does not delete the file. In this state, Bob is fully up to date from his own point of view, as is Alice from her own point of view. -However from the point of view of Alice, who deleted a file and propogated the +However from the point of view of Alice, who deleted a file and propagated the update, Bob is now out of date because he is yet to remove the file that was deleted. diff --git a/dev/contributing.rst b/dev/contributing.rst index 5abab0781..acb844924 100644 --- a/dev/contributing.rst +++ b/dev/contributing.rst @@ -71,7 +71,7 @@ General - All text files use Unix line endings. The git settings already present in the repository attempts to enforce this. -- When making changes, follow the brace and paranthesis style of the +- When making changes, follow the brace and parenthesis style of the surrounding code. Go Specific diff --git a/specs/bep-v1.rst b/specs/bep-v1.rst index 534df2490..c86fd0629 100644 --- a/specs/bep-v1.rst +++ b/specs/bep-v1.rst @@ -190,7 +190,7 @@ For C=1: - The Length field contains the length, in bytes, of the compressed message data plus a four byte uncompressed length field. -- The compressed message data is preceeded by a 32 bit field denoting +- The compressed message data is preceded by a 32 bit field denoting the length of the uncompressed message. - The message data is compressed using the LZ4 format and algorithm @@ -1022,7 +1022,7 @@ is no longer available, therefore the list of block indexes should be truncated. Messages with **Forget** bit set MUST NOT have any block indexes. Any update message which is being sent for a different **Version** of the same -file name must be preceeded with an update message for the old version of that +file name must be preceded with an update message for the old version of that file with the **Forget** bit set. As a safeguard on the receiving side, value of **Version** changing between diff --git a/specs/globaldisco-v3.rst b/specs/globaldisco-v3.rst index bb683bbcd..42da4be1e 100644 --- a/specs/globaldisco-v3.rst +++ b/specs/globaldisco-v3.rst @@ -33,7 +33,7 @@ certificate was presented, status ``403`` (Forbidden) is returned. If the posted data doesn't conform to the expected format, ``400`` (Bad Request) is returned. -In successfull responses, the server may return a ``Reannounce-After`` header +In successful responses, the server may return a ``Reannounce-After`` header containing the number of seconds after which the client should perform a new announcement. @@ -52,7 +52,7 @@ Queries are performed as HTTPS GET requests to the announce server URL. The requested device ID is passed as the query parameter "device", in canonical string form, i.e. ``https://announce.syncthing.net/?device=ABC12345-....`` -Successfull responses will have status code ``200`` (OK) and carry a JSON payload +Successful responses will have status code ``200`` (OK) and carry a JSON payload of the same format as the announcement above. The response will not contain empty or unspecified addresses. diff --git a/specs/relay-v1.rst b/specs/relay-v1.rst index a36303aa1..ef813f6f1 100644 --- a/specs/relay-v1.rst +++ b/specs/relay-v1.rst @@ -157,7 +157,7 @@ Client B - Temporary protocol mode Messages -------- -All messages are preceeded by a header message. Header message contains the +All messages are preceded by a header message. Header message contains the magic value 0x9E79BC40, message type integer, and message length. .. warning:: diff --git a/users/autostart.rst b/users/autostart.rst index 6392db538..a0d6c737a 100644 --- a/users/autostart.rst +++ b/users/autostart.rst @@ -161,7 +161,7 @@ https://github.com/syncthing/syncthing/releases/latest. #. Copy the syncthing binary (the file you would open to launch Syncthing) into a directory called ``bin`` in your home directory i.e. into /home//bin. If "bin" does not exist, create it. -#. Open ``syncthing.plist`` located in /etc/macosx-launchd. Replace the four occurances of /Users/USERNAME with your actual home directory location. +#. Open ``syncthing.plist`` located in /etc/macosx-launchd. Replace the four occurrences of /Users/USERNAME with your actual home directory location. #. Copy the ``syncthing.plist`` file to ``~/Library/LaunchAgents``. If you have trouble finding this location select the "Go" menu in Finder and choose "Go to folder..." and then type @@ -221,7 +221,7 @@ Syncthing running even without an active user session, it is intended to be used on a *server*. Running Syncthing as a user service ensures that Syncthing only starts after the -user has logged into the sytem (e.g., via the graphical login screen, or ssh). +user has logged into the system (e.g., via the graphical login screen, or ssh). Thus, the user service is intended to be used on a *(multiuser) desktop computer*. It avoids unnecessarily running Syncthing instances. diff --git a/users/syncing.rst b/users/syncing.rst index eb6887b78..270feac30 100644 --- a/users/syncing.rst +++ b/users/syncing.rst @@ -23,7 +23,7 @@ another device in the cluster. In the first case the block is simply copied on disk, in the second case it is requested over the network from the other device. -When a block is copied or recieved from another device, its SHA256 hash is +When a block is copied or received from another device, its SHA256 hash is computed and compared with the expected value. If it matches the block is written to a temporary copy of the file, otherwise it is discarded and Syncthing tries to find another source for the block.