all: Correct various typos

Skip-check: authors

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4005
This commit is contained in:
HairyFotr
2017-02-25 08:12:13 +00:00
committed by Jakob Borg
parent 98d22b88a0
commit c56c48a777
15 changed files with 21 additions and 21 deletions

View File

@@ -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))

View File

@@ -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
}

View File

@@ -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 {

View File

@@ -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
}

View File

@@ -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)

View File

@@ -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 {

View File

@@ -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