summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorklemens <ka7@github.com>2016-05-08 10:54:22 +0000
committerJakob Borg <jakob@nym.se>2016-05-08 10:54:22 +0000
commitbd41e21c26186ca7577f426dab16e99cb71f01cb (patch)
tree35cbdc63b44674f99266ceb5f42840bc9b59ff4b
parent10fe23b8f2fd7ad9fbd9e461c0220f3ac054050f (diff)
all: Correct spelling in comments
Skip-check: authors pr-build-mac GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3056
-rw-r--r--cmd/stdisco/main.go4
-rw-r--r--cmd/syncthing/gui.go2
-rw-r--r--cmd/syncthing/gui_test.go4
-rw-r--r--gui/dark/assets/css/theme.css2
-rw-r--r--lib/discover/cache.go2
-rw-r--r--lib/ignore/ignore_test.go4
-rw-r--r--lib/model/devicedownloadstate.go4
-rw-r--r--lib/model/model_test.go2
-rw-r--r--lib/osutil/atomic.go2
-rw-r--r--lib/osutil/ping.go2
-rw-r--r--lib/osutil/rlimit_unix.go4
-rw-r--r--lib/protocol/protocol.go2
-rw-r--r--lib/relay/client/dynamic.go2
-rw-r--r--lib/scanner/blockqueue.go2
14 files changed, 19 insertions, 19 deletions
diff --git a/cmd/stdisco/main.go b/cmd/stdisco/main.go
index 3b1d877c7e..4a43dbad27 100644
--- a/cmd/stdisco/main.go
+++ b/cmd/stdisco/main.go
@@ -29,7 +29,7 @@ var (
var (
// Static prefix that we use when generating fake device IDs, so that we
// can recognize them ourselves. Also makes the device ID start with
- // "STPROBE-" which is humanly recognizeable.
+ // "STPROBE-" which is humanly recognizable.
randomPrefix = []byte{148, 223, 23, 4, 148}
// Our random, fake, device ID that we use when sending announcements.
@@ -117,7 +117,7 @@ func addrStrs(dev discover.Device) []string {
return ss
}
-// returns a random but recognizeable device ID
+// returns a random but recognizable device ID
func randomDeviceID() []byte {
var id [32]byte
copy(id[:], randomPrefix)
diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index 17bd7958df..cbd7455090 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -1211,7 +1211,7 @@ func (s embeddedStatic) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Check for a compiled in asset for the current theme.
bs, ok := s.assets[theme+"/"+file]
if !ok {
- // Check for an overriden default asset.
+ // Check for an overridden default asset.
if s.assetDir != "" {
p := filepath.Join(s.assetDir, config.DefaultTheme, filepath.FromSlash(file))
if _, err := os.Stat(p); err == nil {
diff --git a/cmd/syncthing/gui_test.go b/cmd/syncthing/gui_test.go
index e5ed2d07d2..bee17377d6 100644
--- a/cmd/syncthing/gui_test.go
+++ b/cmd/syncthing/gui_test.go
@@ -137,13 +137,13 @@ func TestAssetsDir(t *testing.T) {
// assetsdir/foo/a exists, overrides compiled in
expectURLToContain(t, s.URL+"/a", "overridden-foo")
- // foo/b is compiled in, default/b is overriden, return compiled in
+ // foo/b is compiled in, default/b is overridden, return compiled in
expectURLToContain(t, s.URL+"/b", "foo")
// only exists as compiled in default/c so use that
expectURLToContain(t, s.URL+"/c", "default")
- // only exists as overriden default/d so use that
+ // only exists as overridden default/d so use that
expectURLToContain(t, s.URL+"/d", "overridden-default")
}
diff --git a/gui/dark/assets/css/theme.css b/gui/dark/assets/css/theme.css
index 25cab97d82..e7bc825510 100644
--- a/gui/dark/assets/css/theme.css
+++ b/gui/dark/assets/css/theme.css
@@ -195,7 +195,7 @@ code.ng-binding{
}
-/* progess bars */
+/* progress bars */
.progress-bar {
background-color: #217dbb !important;
}
diff --git a/lib/discover/cache.go b/lib/discover/cache.go
index b7f6c07310..7f16446b58 100644
--- a/lib/discover/cache.go
+++ b/lib/discover/cache.go
@@ -18,7 +18,7 @@ import (
// The CachingMux aggregates results from multiple Finders. Each Finder has
// an associated cache time and negative cache time. The cache time sets how
-// long we cache and return successfull lookup results, the negative cache
+// long we cache and return successful lookup results, the negative cache
// time sets how long we refrain from asking about the same device ID after
// receiving a negative answer. The value of zero disables caching (positive
// or negative).
diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go
index f74e9bfe87..a37415327d 100644
--- a/lib/ignore/ignore_test.go
+++ b/lib/ignore/ignore_test.go
@@ -295,7 +295,7 @@ func TestCaching(t *testing.T) {
pats.Match(letter)
}
- // Verify that outcomes preserved on next laod
+ // Verify that outcomes preserved on next load
err = pats.Load(fd1.Name())
if err != nil {
@@ -323,7 +323,7 @@ func TestCaching(t *testing.T) {
pats.Match(letter)
}
- // Verify that outcomes provided on next laod
+ // Verify that outcomes provided on next load
err = pats.Load(fd1.Name())
if err != nil {
diff --git a/lib/model/devicedownloadstate.go b/lib/model/devicedownloadstate.go
index 35f0fbd8dd..e6354140a0 100644
--- a/lib/model/devicedownloadstate.go
+++ b/lib/model/devicedownloadstate.go
@@ -28,7 +28,7 @@ type deviceFolderDownloadState struct {
numberOfBlocksInProgress int
}
-// Has returns wether a block at that specific index, and that specific version of the file
+// Has returns whether a block at that specific index, and that specific version of the file
// is currently available on the remote device for pulling from a temporary file.
func (p *deviceFolderDownloadState) Has(file string, version protocol.Vector, index int32) bool {
p.mut.RLock()
@@ -117,7 +117,7 @@ func (t *deviceDownloadState) Update(folder string, updates []protocol.FileDownl
f.Update(updates)
}
-// Has returns wether block at that specific index, and that specific version of the file
+// Has returns whether block at that specific index, and that specific version of the file
// is currently available on the remote device for pulling from a temporary file.
func (t *deviceDownloadState) Has(folder, file string, version protocol.Vector, index int32) bool {
if t == nil {
diff --git a/lib/model/model_test.go b/lib/model/model_test.go
index f7819f1a7b..1c543e83b0 100644
--- a/lib/model/model_test.go
+++ b/lib/model/model_test.go
@@ -1308,7 +1308,7 @@ func TestUnifySubs(t *testing.T) {
[]string{".stfolder", ".stignore"},
},
{
- // 7. but the presense of something else unknown forces an actual
+ // 7. but the presence of something else unknown forces an actual
// scan
[]string{".stfolder", ".stignore", "foo/bar"},
[]string{},
diff --git a/lib/osutil/atomic.go b/lib/osutil/atomic.go
index 736d2f86f3..c244823aa6 100644
--- a/lib/osutil/atomic.go
+++ b/lib/osutil/atomic.go
@@ -20,7 +20,7 @@ var (
)
// An AtomicWriter is an *os.File that writes to a temporary file in the same
-// directory as the final path. On successfull Close the file is renamed to
+// directory as the final path. On successful Close the file is renamed to
// it's final path. Any error on Write or during Close is accumulated and
// returned on Close, so a lazy user can ignore errors until Close.
type AtomicWriter struct {
diff --git a/lib/osutil/ping.go b/lib/osutil/ping.go
index 756037fead..96baf8db08 100644
--- a/lib/osutil/ping.go
+++ b/lib/osutil/ping.go
@@ -14,7 +14,7 @@ import (
)
// TCPPing returns the duration required to establish a TCP connection
-// to the given host. ICMP packets require root priviledges, hence why we use
+// to the given host. ICMP packets require root privileges, hence why we use
// tcp.
func TCPPing(address string) (time.Duration, error) {
start := time.Now()
diff --git a/lib/osutil/rlimit_unix.go b/lib/osutil/rlimit_unix.go
index a308866c2a..d40c3e52ba 100644
--- a/lib/osutil/rlimit_unix.go
+++ b/lib/osutil/rlimit_unix.go
@@ -10,7 +10,7 @@ package osutil
import "syscall"
-// MaximizeOpenFileLimit tries to set the resoure limit RLIMIT_NOFILE (number
+// MaximizeOpenFileLimit tries to set the resource limit RLIMIT_NOFILE (number
// of open file descriptors) to the max (hard limit), if the current (soft
// limit) is below the max. Returns the new (though possibly unchanged) limit,
// or an error if it could not be changed.
@@ -35,7 +35,7 @@ func MaximizeOpenFileLimit() (int, error) {
// If the set succeeded, perform a new get to see what happened. We might
// have gotten a value lower than the one in lim.Max, if lim.Max was
- // something that indiciated "unlimited" (i.e. intmax).
+ // something that indicated "unlimited" (i.e. intmax).
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &lim); err != nil {
// We don't really know the correct value here since Getrlimit
// mysteriously failed after working once... Shouldn't ever happen, I
diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go
index 3de5d898e3..2f8a9dc6f8 100644
--- a/lib/protocol/protocol.go
+++ b/lib/protocol/protocol.go
@@ -772,7 +772,7 @@ func (c *rawConnection) pingSender() {
}
}
-// The pingReciever checks that we've received a message (any message will do,
+// The pingReceiver checks that we've received a message (any message will do,
// but we expect pings in the absence of other messages) within the last
// ReceiveTimeout. If not, we close the connection with an ErrTimeout.
func (c *rawConnection) pingReceiver() {
diff --git a/lib/relay/client/dynamic.go b/lib/relay/client/dynamic.go
index 041c5c250f..7100feb02b 100644
--- a/lib/relay/client/dynamic.go
+++ b/lib/relay/client/dynamic.go
@@ -182,7 +182,7 @@ func (c *dynamicClient) setError(err error) {
c.mut.Unlock()
}
-// This is the announcement recieved from the relay server;
+// This is the announcement received from the relay server;
// {"relays": [{"url": "relay://10.20.30.40:5060"}, ...]}
type dynamicAnnouncement struct {
Relays []struct {
diff --git a/lib/scanner/blockqueue.go b/lib/scanner/blockqueue.go
index 41f282081b..91a89d076e 100644
--- a/lib/scanner/blockqueue.go
+++ b/lib/scanner/blockqueue.go
@@ -14,7 +14,7 @@ import (
"github.com/syncthing/syncthing/lib/sync"
)
-// The parallell hasher reads FileInfo structures from the inbox, hashes the
+// The parallel hasher reads FileInfo structures from the inbox, hashes the
// file to populate the Blocks element and sends it to the outbox. A number of
// workers are used in parallel. The outbox will become closed when the inbox
// is closed and all items handled.