From 1901a5a9f44ef3f90013d86eaf7a1167322f840d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matic=20Poto=C4=8Dnik?= <hairyfotr@gmail.com>
Date: Sat, 24 Feb 2018 08:51:29 +0100
Subject: [PATCH] all: Fix typos (#4772)

Skip-check: authors
---
 cmd/stdiscosrv/database_test.go | 2 +-
 cmd/stdiscosrv/replication.go   | 2 +-
 lib/fs/folding_test.go          | 2 +-
 lib/model/model.go              | 2 +-
 lib/osutil/symlink_windows.go   | 4 ++--
 lib/upgrade/upgrade_test.go     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/stdiscosrv/database_test.go b/cmd/stdiscosrv/database_test.go
index 1cfd28519..be7340810 100644
--- a/cmd/stdiscosrv/database_test.go
+++ b/cmd/stdiscosrv/database_test.go
@@ -154,7 +154,7 @@ func TestDatabaseGetSet(t *testing.T) {
 	}
 	if len(rec.Addresses) != 1 {
 		t.Log(rec.Addresses)
-		t.Fatal("should have one addres")
+		t.Fatal("should have one address")
 	}
 	if rec.Misses != 0 {
 		t.Log(rec.Misses)
diff --git a/cmd/stdiscosrv/replication.go b/cmd/stdiscosrv/replication.go
index 5d8f804ab..2969a78e5 100644
--- a/cmd/stdiscosrv/replication.go
+++ b/cmd/stdiscosrv/replication.go
@@ -149,7 +149,7 @@ func (m replicationMultiplexer) send(key string, ps []DatabaseAddress, seen int6
 	}
 }
 
-// replicationListener acceptes incoming connections and reads replication
+// replicationListener accepts incoming connections and reads replication
 // items from them. Incoming items are applied to the KV store.
 type replicationListener struct {
 	addr       string
diff --git a/lib/fs/folding_test.go b/lib/fs/folding_test.go
index 11e43962f..bbce66ac4 100644
--- a/lib/fs/folding_test.go
+++ b/lib/fs/folding_test.go
@@ -23,7 +23,7 @@ func TestUnicodeLowercase(t *testing.T) {
 		{"ὈΔΥΣΣΕΎΣ", "ὀδυσσεύσ"},
 		// German ß doesn't really have an upper case variant, and we
 		// shouldn't mess things up when lower casing it either. We don't
-		// attempt to make ß equivalant to "ss".
+		// attempt to make ß equivalent to "ss".
 		{"Reichwaldstraße", "reichwaldstraße"},
 		// The Turks do their thing with the Is.... Like the Greek example
 		// we pick just the one canonicalized "i" although you can argue
diff --git a/lib/model/model.go b/lib/model/model.go
index 304f33e43..176a3e399 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1405,7 +1405,7 @@ func (cf cFiler) CurrentFile(file string) (protocol.FileInfo, bool) {
 	return cf.m.CurrentFolderFile(cf.r, file)
 }
 
-// Connection returns the current connection for device, and a boolean wether a connection was found.
+// Connection returns the current connection for device, and a boolean whether a connection was found.
 func (m *Model) Connection(deviceID protocol.DeviceID) (connections.Connection, bool) {
 	m.pmut.RLock()
 	cn, ok := m.conn[deviceID]
diff --git a/lib/osutil/symlink_windows.go b/lib/osutil/symlink_windows.go
index f3341c8b9..aaf4b86ac 100644
--- a/lib/osutil/symlink_windows.go
+++ b/lib/osutil/symlink_windows.go
@@ -26,7 +26,7 @@ func DebugSymlinkForTestsOnly(oldname, newname string) error {
 	// '/' does not work in link's content
 	oldname = filepath.FromSlash(oldname)
 
-	// need the exact location of the oldname when its relative to determine if its a directory
+	// need the exact location of the oldname when it's relative to determine if it's a directory
 	destpath := oldname
 	if !filepath.IsAbs(oldname) {
 		destpath = filepath.Dir(newname) + `\` + oldname
@@ -75,7 +75,7 @@ func fixLongPath(path string) string {
 	// minus 12)." Since MAX_PATH is 260, 260 - 12 = 248.
 	//
 	// The MSDN docs appear to say that a normal path that is 248 bytes long
-	// will work; empirically the path must be less then 248 bytes long.
+	// will work; empirically the path must be less than 248 bytes long.
 	if len(path) < 248 {
 		// Don't fix. (This is how Go 1.7 and earlier worked,
 		// not automatically generating the \\?\ form)
diff --git a/lib/upgrade/upgrade_test.go b/lib/upgrade/upgrade_test.go
index 7ece02b3e..ed3c824c6 100644
--- a/lib/upgrade/upgrade_test.go
+++ b/lib/upgrade/upgrade_test.go
@@ -122,7 +122,7 @@ func TestSelectedReleaseMacOS(t *testing.T) {
 		t.Skip("macOS only")
 	}
 
-	// The alterantives that we expect should work
+	// The alternatives that we expect should work
 	assetNames := []string{
 		"syncthing-macos-amd64-v0.14.47.tar.gz",
 		"syncthing-macosx-amd64-v0.14.47.tar.gz",