From 0ad10b0feeb8a035bd140613ee6226b05d70424d Mon Sep 17 00:00:00 2001 From: HairyFotr Date: Thu, 20 Jul 2017 13:10:46 +0000 Subject: [PATCH] all: Typos Skip-check: authors GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4263 --- README.md | 2 +- cmd/syncthing/gui_test.go | 2 +- cmd/syncthing/main.go | 2 +- etc/linux-upstart/README.md | 2 +- lib/connections/kcp_misc.go | 8 ++++---- lib/model/model.go | 2 +- test/reset_test.go | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 09e71f1b2..1d86f33e7 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ All code is licensed under the [MPLv2 License][7]. [1]: https://docs.syncthing.net/specs/bep-v1.html [2]: https://docs.syncthing.net/intro/getting-started.html [3]: https://github.com/syncthing/syncthing/blob/master/etc -[4]: http://www.freenode.net/ +[4]: https://www.freenode.net/ [5]: https://docs.syncthing.net/dev/building.html [6]: https://docs.syncthing.net/ [7]: https://github.com/syncthing/syncthing/blob/master/LICENSE diff --git a/cmd/syncthing/gui_test.go b/cmd/syncthing/gui_test.go index f89a22dca..1ab8176e9 100644 --- a/cmd/syncthing/gui_test.go +++ b/cmd/syncthing/gui_test.go @@ -943,7 +943,7 @@ func TestEventMasks(t *testing.T) { } expected = 0 - if mask := svc.getEventMask("WeirdEvent,something else that doens't exist"); mask != expected { + if mask := svc.getEventMask("WeirdEvent,something else that doesn't exist"); mask != expected { t.Errorf("incorrect parsed mask %x != %x", int64(mask), int64(expected)) } diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 724c259b0..3accf6d48 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -1074,7 +1074,7 @@ func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Mode if cfg.Options().StartBrowser && !runtimeOptions.noBrowser && !runtimeOptions.stRestarting { // Can potentially block if the utility we are invoking doesn't - // fork, and just execs, hence keep it in it's own routine. + // fork, and just execs, hence keep it in its own routine. <-api.startedOnce go openURL(guiCfg.URL()) } diff --git a/etc/linux-upstart/README.md b/etc/linux-upstart/README.md index 83174ccd4..f9437c45b 100644 --- a/etc/linux-upstart/README.md +++ b/etc/linux-upstart/README.md @@ -5,7 +5,7 @@ the "Upstart" service manager on Linux. To have syncthing start when you login place "user/syncthing.conf" in the "/home/[username]/.config/upstart/" folder. To have syncthing start when the system boots place "system/syncthing.conf" in the "/etc/init/" folder. -To manualy start syncthing via Upstart when using the system configuration use: +To manually start syncthing via Upstart when using the system configuration use: ``` sudo initctl start syncthing diff --git a/lib/connections/kcp_misc.go b/lib/connections/kcp_misc.go index c11cfe957..20efb335c 100644 --- a/lib/connections/kcp_misc.go +++ b/lib/connections/kcp_misc.go @@ -26,8 +26,8 @@ var ( type filterList []*pfilter.PacketFilter -// Sort connections by wether the are unspecified or not, as connections -// listenin on all addresses are more useful. +// Sort connections by whether they are unspecified or not, as connections +// listening on all addresses are more useful. func (f filterList) Len() int { return len(f) } func (f filterList) Swap(i, j int) { f[i], f[j] = f[j], f[i] } func (f filterList) Less(i, j int) bool { @@ -92,7 +92,7 @@ func (f *kcpConversationFilter) Outgoing(out []byte, addr net.Addr) { } func (kcpConversationFilter) isKCPConv(data []byte) bool { - // Need atleast 5 bytes + // Need at least 5 bytes if len(data) < 5 { return false } @@ -143,7 +143,7 @@ func (f *stunFilter) ClaimIncoming(in []byte, addr net.Addr) bool { } func (f *stunFilter) isStunPayload(data []byte) bool { - // Need atleast 20 bytes + // Need at least 20 bytes if len(data) < 20 { return false } diff --git a/lib/model/model.go b/lib/model/model.go index c20f1f1e4..7f69c2056 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -533,7 +533,7 @@ func (m *Model) Completion(device protocol.DeviceID, folder string) FolderComple // If the completion is 100% but there are deletes we need to handle, // drop it down a notch. Hack for consumers that look only at the - // percentage (our own GUI does the same calculation as here on it's own + // percentage (our own GUI does the same calculation as here on its own // and needs the same fixup). if need == 0 && deletes > 0 { completionPct = 95 // chosen by fair dice roll diff --git a/test/reset_test.go b/test/reset_test.go index ee199820a..e0b1c2029 100644 --- a/test/reset_test.go +++ b/test/reset_test.go @@ -33,7 +33,7 @@ func TestReset(t *testing.T) { size := createFiles(t) p := startInstance(t, 1) - defer p.Stop() // Not checkedStop, because Syncthing will exit on it's own + defer p.Stop() // Not checkedStop, because Syncthing will exit on its own m, err := p.Model("default") if err != nil { @@ -76,7 +76,7 @@ func TestReset(t *testing.T) { // ---- Syncthing exits here ---- p = startInstance(t, 1) - defer p.Stop() // Not checkedStop, because Syncthing will exit on it's own + defer p.Stop() // Not checkedStop, because Syncthing will exit on its own m, err = p.Model("default") if err != nil {