From c56c48a7772bb1ef644d96fee1e5e44d8703bbf1 Mon Sep 17 00:00:00 2001 From: HairyFotr Date: Sat, 25 Feb 2017 08:12:13 +0000 Subject: [PATCH] all: Correct various typos Skip-check: authors GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4005 --- GOALS.md | 4 ++-- cmd/strelaypoolsrv/gui/index.html | 2 +- cmd/strelaysrv/README.md | 2 +- cmd/syncthing/main.go | 2 +- gui/default/syncthing/core/modalDirective.js | 2 +- lib/connections/service.go | 2 +- lib/model/progressemitter.go | 2 +- lib/protocol/deviceid_test.go | 2 +- lib/scanner/walk.go | 2 +- lib/upgrade/upgrade_supported.go | 2 +- lib/versioner/external_test.go | 2 +- lib/weakhash/weakhash.go | 2 +- man/strelaysrv.1 | 6 +++--- man/syncthing-faq.7 | 6 +++--- man/syncthing.1 | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/GOALS.md b/GOALS.md index 31ea91db8..e96f72ec4 100644 --- a/GOALS.md +++ b/GOALS.md @@ -1,6 +1,6 @@ # The Syncthing Goals -Syncthing is a **continous file synchronization program**. It synchronizes +Syncthing is a **continuous file synchronization program**. It synchronizes files between two or more computers. We strive to fulfill the goals below. The goals are listed in order of importance, the most important one being the first. @@ -80,4 +80,4 @@ conflict with the stated goals above. > providing entertainment value for the maintainers are also things that > matter. It is understood that there are aspects of Syncthing that are > suboptimal or even in opposition with the goals above. However, we -> continously strive to align Syncthing more and more with these goals. \ No newline at end of file +> continuously strive to align Syncthing more and more with these goals. diff --git a/cmd/strelaypoolsrv/gui/index.html b/cmd/strelaypoolsrv/gui/index.html index 27f23f116..407f6e849 100644 --- a/cmd/strelaypoolsrv/gui/index.html +++ b/cmd/strelaypoolsrv/gui/index.html @@ -48,7 +48,7 @@

-

The circle size represents how much bytes the relay transfered relative to other relays

+

The circle size represents how much bytes the relay transferred relative to other relays

diff --git a/cmd/strelaysrv/README.md b/cmd/strelaysrv/README.md index 43255bf08..1bb0f5024 100644 --- a/cmd/strelaysrv/README.md +++ b/cmd/strelaysrv/README.md @@ -6,7 +6,7 @@ This is the relay server for the `syncthing` project. :exclamation:Warnings:exclamation: - Read or regret ----- -By default, all relay servers will join to the default public relay pool, which means that the relay server will be availble for public use, and **will consume your bandwidth** helping others to connect. +By default, all relay servers will join to the default public relay pool, which means that the relay server will be available for public use, and **will consume your bandwidth** helping others to connect. If you wish to disable this behaviour, please specify the `-pools=""` argument. diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index c84d44c57..290ba719c 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -633,7 +633,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) { // report the error if there is one. osutil.MaximizeOpenFileLimit() - // Ensure that that we have a certificate and key. + // Ensure that we have a certificate and key. cert, err := tls.LoadX509KeyPair(locations[locCertFile], locations[locKeyFile]) if err != nil { l.Infof("Generating ECDSA key and certificate for %s...", tlsDefaultCommonName) diff --git a/gui/default/syncthing/core/modalDirective.js b/gui/default/syncthing/core/modalDirective.js index 44171e115..def2ff3fa 100644 --- a/gui/default/syncthing/core/modalDirective.js +++ b/gui/default/syncthing/core/modalDirective.js @@ -30,7 +30,7 @@ angular.module('syncthing.core') var aboveLargestZ = largestZ + 10; $(element).css('zIndex', aboveLargestZ); - // set backdrop z-index. timeout used because element does not exist immediatly + // set backdrop z-index. timeout used because element does not exist immediately setTimeout(function () { $('.modal-backdrop:not(:last)').removeClass('in').addClass('out'); $('.modal-backdrop:last').attr('for-modal-id', $(element).attr('id')).css('zIndex', aboveLargestZ - 5); diff --git a/lib/connections/service.go b/lib/connections/service.go index 99f47fd9c..eb174733c 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -137,7 +137,7 @@ func NewService(cfg *config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg * // There are several moving parts here; one routine per listening address // (handled in configuration changing) to handle incoming connections, // one routine to periodically attempt outgoing connections, one routine to - // the the common handling regardless of whether the connection was + // the common handling regardless of whether the connection was // incoming or outgoing. service.Add(serviceFunc(service.connect)) diff --git a/lib/model/progressemitter.go b/lib/model/progressemitter.go index 7f1764fb8..a06487a48 100755 --- a/lib/model/progressemitter.go +++ b/lib/model/progressemitter.go @@ -212,7 +212,7 @@ func (t *ProgressEmitter) Register(s *sharedPullerState) { if len(t.registry) == 0 { t.timer.Reset(t.interval) } - // Separate the folder ID (arbitrary string) and and the file name by "//" + // Separate the folder ID (arbitrary string) and the file name by "//" // because it never appears in a valid file name. t.registry[s.folder+"//"+s.file.Name] = s } diff --git a/lib/protocol/deviceid_test.go b/lib/protocol/deviceid_test.go index 691567d03..02893b2a4 100644 --- a/lib/protocol/deviceid_test.go +++ b/lib/protocol/deviceid_test.go @@ -137,7 +137,7 @@ func TestNewDeviceIDMarshalling(t *testing.T) { t.Fatal(err) } - // Create an old style message and and attempt unmarshal + // Create an old style message and attempt unmarshal var msg2 TestOldDeviceID if err := msg2.Unmarshal(bs); err != nil { diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index 869445eac..8925d5271 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -71,7 +71,7 @@ type Config struct { ProgressTickIntervalS int // Signals cancel from the outside - when closed, we should stop walking. Cancel chan struct{} - // Wether or not we should also compute weak hashes + // Whether or not we should also compute weak hashes UseWeakHashes bool } diff --git a/lib/upgrade/upgrade_supported.go b/lib/upgrade/upgrade_supported.go index 519063df1..e73432ff9 100644 --- a/lib/upgrade/upgrade_supported.go +++ b/lib/upgrade/upgrade_supported.go @@ -391,7 +391,7 @@ func verifyUpgrade(archiveName, tempName string, sig []byte) error { // // We then verify the release signature against the contents of this // multireader. This ensures that it is not only a bonafide syncthing - // binary, but it it also of exactly the platform and version we expect. + // binary, but it is also of exactly the platform and version we expect. mr := io.MultiReader(bytes.NewBufferString(archiveName+"\n"), fd) err = signature.Verify(SigningKey, sig, mr) diff --git a/lib/versioner/external_test.go b/lib/versioner/external_test.go index 2cffa4044..0ecd9760a 100644 --- a/lib/versioner/external_test.go +++ b/lib/versioner/external_test.go @@ -28,7 +28,7 @@ func TestExternalNoCommand(t *testing.T) { // The versioner should fail due to missing command. e := External{ - command: "nonexistant command", + command: "nonexistent command", folderPath: "testdata/folder path", } if err := e.Archive(file); err == nil { diff --git a/lib/weakhash/weakhash.go b/lib/weakhash/weakhash.go index c3738a385..37f0bab65 100644 --- a/lib/weakhash/weakhash.go +++ b/lib/weakhash/weakhash.go @@ -99,7 +99,7 @@ type Finder struct { // Iterate iterates all available blocks that matches the provided hash, reads // them into buf, and calls the iterator function. The iterator function should -// return wether it wishes to continue interating. +// return whether it wishes to continue iterating. func (h *Finder) Iterate(hash uint32, buf []byte, iterFunc func(int64) bool) (bool, error) { if h == nil || hash == 0 || len(buf) != h.size { return false, nil diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index b189fad60..9252d1c4d 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -247,12 +247,12 @@ although your milage may vary. .sp The relay server listens on two ports by default. One for data connections and the other for providing public statistics at \fI\%http://relays.syncthing.net/\fP\&. The firewall, such as -\fBiptables\fP, must permit incoming TCP connetions to the following ports: +\fBiptables\fP, must permit incoming TCP connections to the following ports: .INDENT 0.0 .IP \(bu 2 -Data port: \fB22067/tcp\fP overriden with \fB\-listen\fP and advertised with \fB\-ext\-address\fP +Data port: \fB22067/tcp\fP overridden with \fB\-listen\fP and advertised with \fB\-ext\-address\fP .IP \(bu 2 -Status port: \fB22070/tcp\fP overriden with \fB\-status\-srv\fP +Status port: \fB22070/tcp\fP overridden with \fB\-status\-srv\fP .UNINDENT .sp Runtime \fBiptables\fP rules to allow access to the default ports: diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 98c142137..f08d81864 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -211,7 +211,7 @@ everywhere else and we don\(aqt know which of the conflicting files is the "best from the user point of view. Moreover, if there\(aqs something that automatically causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-conflict \-...\-sync\-conflict\fP files. -.SS Am I able to use nested Synthing folders? +.SS Am I able to use nested Syncthing folders? .sp Do not nest shared folders. This behaviour is in no way supported, recommended or coded for in any way, and comes with many pitfalls. @@ -398,12 +398,12 @@ This is almost always a result of bad RAM, storage device or other hardware. Whe You can change the theme in the settings. Syncthing ships with other themes than the default. .sp -If you want a custom theme or a completly different GUI, you can add your +If you want a custom theme or a completely different GUI, you can add your own. By default, Syncthing will look for a directory \fBgui\fP inside the Syncthing home folder. To change the directory to look for themes, you need to set the STGUIASSETS environment variable. To get the concrete directory, run -syncthing with the \fB\-paths\fP parameter. It will print all the relevent paths, +syncthing with the \fB\-paths\fP parameter. It will print all the relevant paths, including the "GUI override directory". .sp To add e.g. a red theme, you can create the file \fBred/assets/css/theme.css\fP diff --git a/man/syncthing.1 b/man/syncthing.1 index fd5172db6..25efba1f7 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -328,8 +328,8 @@ Equivalent to the \-no\-restart argument. Disable the Syncthing monitor process Disable automatic upgrades. .TP .B STHASHING -Specifiy which hashing package to use. Defaults to automatic based on -peformance. Specify "minio" (compatibility) or "standard" for the default Go implementation. +Specify which hashing package to use. Defaults to automatic based on +performance. Specify "minio" (compatibility) or "standard" for the default Go implementation. .TP .B GOMAXPROCS Set the maximum number of CPU cores to use. Defaults to all available CPU