Fix various typos

[nor...@perkeep.org]

https://github.com/perkeep/perkeep/commit/d605f86c82b6a60e45b7f0d128cbdaef698773f5

commit d605f86c82b6a60e45b7f0d128cbdaef698773f5
Author: luz paz <luz...@pm.me>
Date: Thu Apr 28 19:04:07 2022 -0400

Fix various typos

Found via `codespell -q 3 -S ./clients/web/embed,./clients/chrome -L ba,everytime,impres,keypair,msdos,pres,ro,te,ue`

diff --git a/app/publisher/main.go b/app/publisher/main.go
index 15aa73c..4ca22aa 100644
--- a/app/publisher/main.go
+++ b/app/publisher/main.go
@@ -90,7 +90,7 @@ type config struct {
}

// appConfig keeps on trying to fetch the extra config from the app handler. If
-// it doesn't succed after an hour has passed, the program exits.
+// it doesn't succeed after an hour has passed, the program exits.
func appConfig() (*config, error) {
configURL := os.Getenv("CAMLI_APP_CONFIG_URL")
if configURL == "" {
diff --git a/app/scanningcabinet/handler.go b/app/scanningcabinet/handler.go
index 977cb27..01cd19b 100644
--- a/app/scanningcabinet/handler.go
+++ b/app/scanningcabinet/handler.go
@@ -546,7 +546,7 @@ func (h *handler) handleDoc(w http.ResponseWriter, r *http.Request) {
if sizeParam := r.FormValue("size"); sizeParam != "" {
sizeint, err := strconv.Atoi(sizeParam)
if err != nil {
- httputil.ServeError(w, r, fmt.Errorf("invalide size param %q: %v", sizeParam, err))
+ httputil.ServeError(w, r, fmt.Errorf("invalid size param %q: %v", sizeParam, err))
return
}
size = sizeint
diff --git a/clients/android/app/src/main/java/org/camlistore/UploadService.java b/clients/android/app/src/main/java/org/camlistore/UploadService.java
index 6db858d..def4a06 100644
--- a/clients/android/app/src/main/java/org/camlistore/UploadService.java
+++ b/clients/android/app/src/main/java/org/camlistore/UploadService.java
@@ -176,7 +176,7 @@ public class UploadService extends Service {
startService(new Intent(UploadService.this, UploadService.class));
}

- // This is @Override as of SDK version 5, but we're targetting 4 (Android
+ // This is @Override as of SDK version 5, but we're targeting 4 (Android
// 1.6)
private static final int START_STICKY = 1; // in SDK 5

diff --git a/cmd/pk-put/files.go b/cmd/pk-put/files.go
index 358592f..d086aaa 100644
--- a/cmd/pk-put/files.go
+++ b/cmd/pk-put/files.go
@@ -459,7 +459,7 @@ func (up *Uploader) noStatReceiver(r blobserver.BlobReceiver) blobserver.StatRec
// already checks the have cache anyway, so going right to mid-chunk
// receives is fine.
//
-// TODO(bradfitz): this probabaly all needs an audit/rationalization/tests
+// TODO(bradfitz): this probably all needs an audit/rationalization/tests
// to make sure all the players are agreeing on the responsibilities.
// And maybe the Android stats are wrong, too. (see pkg/client/android's
// StatReceiver)
diff --git a/dev/envvardoc/envvardoc.go b/dev/envvardoc/envvardoc.go
index 823a0f9..2e36fb3 100644
--- a/dev/envvardoc/envvardoc.go
+++ b/dev/envvardoc/envvardoc.go
@@ -88,7 +88,7 @@ func (ec *envCollector) findEnvVars(path string, r io.Reader) error {
err := scanner.Err()
if err == bufio.ErrTooLong {
// Happens only for unreasonably long lines.
- // In our case the webui's embeded stuff.
+ // In our case the webui's embedded stuff.
return nil
}
return err
diff --git a/doc/client-config.md b/doc/client-config.md
index c0f4470..54d19c8 100644
--- a/doc/client-config.md
+++ b/doc/client-config.md
@@ -81,7 +81,7 @@ server configurations. For example:

* `server`: The perkeepd server to connect to, of the form:
"[http[s]://]host[:port][/prefix]". Defaults to https. This option can be
- overriden with the "-server" command-line flag.
+ overridden with the "-server" command-line flag.

Most client commands are meant to communicate with a blobserver. For such
commands, instead of the client relying on discovery to choose the actual
diff --git a/doc/environment-vars.md b/doc/environment-vars.md
index d7fca44..ad1a756 100644
--- a/doc/environment-vars.md
+++ b/doc/environment-vars.md
@@ -100,7 +100,7 @@ or
`CAMLI_GCE_SERVICE_ACCOUNT` (string)
: See `CAMLI_GCE_*` first. Path to a Google service account JSON file. This
account should have at least compute.readonly permissions on the Google
- Project wih ID CAMLI_GCE_PROJECT. It is used to authenticate when querying
+ Project with ID CAMLI_GCE_PROJECT. It is used to authenticate when querying
for the list of all the existing zones. If blank, a hard-coded list of zones
is used instead.

@@ -223,10 +223,10 @@ files to be ignored by [pkg/client](/pkg/client) when uploading.

`CAMLI_DEBUG_CONFIG` (bool)
: Causes pkg/serverconfig to dump low-level configuration derived from
- high-level configuation on load.
+ high-level configuration on load.

`CAMLI_DEBUG_X` (string)
-: String containing magic substring(s) to enable debuggging in code.
+: String containing magic substring(s) to enable debugging in code.

`CAMLI_DEBUG_UPLOADS` (bool)
: Used by [pkg/client](/pkg/client) to enable additional logging.
diff --git a/doc/json-signing/README.md b/doc/json-signing/README.md
index cbe8212..5306471 100644
--- a/doc/json-signing/README.md
+++ b/doc/json-signing/README.md
@@ -128,7 +128,7 @@ In review:
S == ascii-armored detached signature of T
C == CONCAT(T, ',"camliSig":"', S, '"}', '\n')

-(strictly, the trailing newline and the exact JSON serialziation of
+(strictly, the trailing newline and the exact JSON serialization of
the camlisig element doesn't matter, but it'd be advised to follow
this recommendation for compatibility with other verification code)

diff --git a/doc/overview.md b/doc/overview.md
index 4a7bee2..20542db 100644
--- a/doc/overview.md
+++ b/doc/overview.md
@@ -30,7 +30,7 @@ The project began because I wanted to...

* ... **have a POSIX-y filesystem when I want one**. And it should all be
logically available on my tiny laptop's SSD disk, even if my laptop's disk is
- miniscule compared to my entire repo. That is, there should actually be a
+ minuscule compared to my entire repo. That is, there should actually be a
caching virtual filesystem, not a daemon running rsync in the background. If
I have to have a complete copy of my data locally, or I have to "choose which
folders" to sync, that's broken.
@@ -106,7 +106,7 @@ that.

You are in control of your Perkeep server(s), whether you run
your own copy or use a hosted version. In the latter case, you're at
-least logically in control, analagous to how you're in charge of your
+least logically in control, analogous to how you're in charge of your
email (and it's your private repository of all your email), even if a
big company runs your email for you. Of course, you can also store all
your email in Perkeep too, but Gmail's interface and search is much
diff --git a/doc/overview.txt b/doc/overview.txt
index 8fd1f42..aa6afdc 100644
--- a/doc/overview.txt
+++ b/doc/overview.txt
@@ -3,7 +3,7 @@ Perkeep (was Camlistore: Content-Addressable Multi-Layer, Indexed Store)
============================================================================

This file contains old design notes. They're correct in spirit, but shouldn't
-be considered authorative.
+be considered authoritative.

See http://perkeep.org/doc/

@@ -65,7 +65,7 @@ Schema of files/objects in Layer 1:

* The filename, stat(2) metadata (modtime, ctime, permissions, etc) now
also need to be stored. The key design point here is that file
- metdata is ALSO just a blob, content-addressed. The blob is a JSON
+ metadata is ALSO just a blob, content-addressed. The blob is a JSON
file (for human readability, compactness). XML and Protocol Buffers
were both also considered, but the former is too redundant, bloaty,
tree-ish (overkill) and out of vogue, while Protocol Buffers don't
diff --git a/doc/protocol/blob-get.md b/doc/protocol/blob-get.md
index 94b9312..c93a24d 100644
--- a/doc/protocol/blob-get.md
+++ b/doc/protocol/blob-get.md
@@ -13,7 +13,7 @@ The response must include an explicit Content-Length, even with HTTP/1.1.

## Get a blob

-Reqeust:
+Request:

GET /camli/sha1-126249fd8c18cbb5312a5705746a2af87fba9538 HTTP/1.1
Host: example.com
diff --git a/doc/publishing/README.md b/doc/publishing/README.md
index 8983de4..e8ec440 100644
--- a/doc/publishing/README.md
+++ b/doc/publishing/README.md
@@ -31,7 +31,7 @@ set to "mypics" which will serve as the root node for publishing.
(See further settings for running behind a reverse proxy down below.)

Suppose you want to publish two permanodes as "foo" and "bar". The root node
-needs the following atributes:
+needs the following attributes:

camliRoot = mypics // must match server-config.json
camilPath:foo = sha1-foo
diff --git a/doc/release/0.7.html b/doc/release/0.7.html
index 03fa0f1..1b9013d 100644
--- a/doc/release/0.7.html
+++ b/doc/release/0.7.html
@@ -46,7 +46,7 @@ Or browse at Github: <a href="https://github.com/bradfitz/camlistore/tree/0.7">g
</ul>
<h3>Search</h3>
<ul>
- <li>Audio indexing (mp3 ID3 metdata)</li>
+ <li>Audio indexing (mp3 ID3 metadata)</li>
<li>before: and after: search constraints</li>
<li>Case-insensitive attribute search</li>
<li>added PermanodeConstraint.ValueMatches{Int,Float}</li>
diff --git a/doc/release/0.8.html b/doc/release/0.8.html
index 75e1d3e..91ed614 100644
--- a/doc/release/0.8.html
+++ b/doc/release/0.8.html
@@ -34,7 +34,7 @@ Or browse at Github: <a href="https://github.com/bradfitz/camlistore/tree/0.8">g

<h2>Release stats</h2>

-<p>30 total commiters over 610 commits since <a href="/doc/release/0.7">Camlistore 0.7</a>, including Aaron Boodman, Andrew Gerrand, Antti Rasinen, Bill Thiede, Brad Fitzpatrick, Bret Comnes, Brian Gitonga Marete, Daniel Coonce, Daniel Erat, Edward Sheffler III, Eric Drechsel, Govert Versluis, Hernan Grecco, Joshua Gay, Mario Russo, Mathieu Lonjaret, Matt Jibson, Nick O'Neill, Philip Snowberger, Piotr S. Staszewski, Ritesh Sinha, Rob Young, Robert Kroeger, Steven L. Speek, Tamás Gulácsi.</p>
+<p>30 total committers over 610 commits since <a href="/doc/release/0.7">Camlistore 0.7</a>, including Aaron Boodman, Andrew Gerrand, Antti Rasinen, Bill Thiede, Brad Fitzpatrick, Bret Comnes, Brian Gitonga Marete, Daniel Coonce, Daniel Erat, Edward Sheffler III, Eric Drechsel, Govert Versluis, Hernan Grecco, Joshua Gay, Mario Russo, Mathieu Lonjaret, Matt Jibson, Nick O'Neill, Philip Snowberger, Piotr S. Staszewski, Ritesh Sinha, Rob Young, Robert Kroeger, Steven L. Speek, Tamás Gulácsi.</p>

<p>Thank you!</p>

@@ -61,7 +61,7 @@ Or browse at Github: <a href="https://github.com/bradfitz/camlistore/tree/0.8">g
</ul>
<h3>Search</h3>
<ul>
- <li>Indexer now gracefully handles dependent blobs arriving out of order and reschedules indexing as dependencies are satisified. This means full syncs in arbitrary orders don't confuse the indexer.</li>
+ <li>Indexer now gracefully handles dependent blobs arriving out of order and reschedules indexing as dependencies are satisfied. This means full syncs in arbitrary orders don't confuse the indexer.</li>
<li>RelationConstraint implemented for Relation type "parent"</li>
<li>Search operator syntax for searching permanodes for arbitrary attributes: <code>attr:&lt;attribute_name&gt;:&lt;attribute_value&gt;</code></li>
<li>Search operator syntax for searching permanodes by their parent permanode(s): <code>childrenof:sha1-xxxxx</code></li>
diff --git a/doc/release/0.9.html b/doc/release/0.9.html
index 41f2eef..4de75d6 100644
--- a/doc/release/0.9.html
+++ b/doc/release/0.9.html
@@ -78,7 +78,7 @@ Binary release, new in this release:
<h2>Release stats</h2>

<p>
-33 total commiters over 942 commits since <a
+33 total committers over 942 commits since <a
href="/doc/release/0.8">Camlistore 0.8</a>, including Aaron Bieber,
Aaron Boodman, Andrew Gerrand, Antonin Amand, Bill Thiede, Brad
Fitzpatrick, David Jack, Emil Hessman, Eric Drechsel, Fabian Reinartz,
@@ -234,10 +234,10 @@ Aljammāz, Steven L. Speek, Tamás Gulácsi, Will Norris.
<li>Simpler URL blobRef format: <code>/ui/<blobref></code>.</li>
<li>Some new features:</li>
<ul>
- <li>Improved uploading: context aware (add to an existing set), duplicate detection/prevention, better drop area, show bytes transfered.</li>
+ <li>Improved uploading: context aware (add to an existing set), duplicate detection/prevention, better drop area, show bytes transferred.</li>
<li>Aspects: generic attributes editor for permanode aspect. New directory aspect.</li>
<li>Sidebar: mass tagging/deleting.</li>
- <li>Selections state is saved accross navigation.</li>
+ <li>Selections state is saved across navigation.</li>
<li>Download: view original (non-resized) item.</li>
<li>Videos rendering.</li>
</ul>
diff --git a/doc/release/log.sh b/doc/release/log.sh
index c2869dd..9e75482 100755
--- a/doc/release/log.sh
+++ b/doc/release/log.sh
@@ -1,4 +1,4 @@
#!/bin/bash

PREV=0.8
-echo "$(git shortlog -e -s $PREV..HEAD | sed -e 's/^.*<//;s/>.*$//' | uniq | wc -l) total commiters over $(git log --format=oneline $PREV..HEAD | wc -l) commits since $PREV (), including $(i=0; git shortlog -s $PREV..HEAD | cut -c8- | fgrep ' ' | while read nm; do i=$(($i + 1)); if [ $i -ge 2 ]; then echo -n ', '; fi; echo -n "$nm"; done)."
+echo "$(git shortlog -e -s $PREV..HEAD | sed -e 's/^.*<//;s/>.*$//' | uniq | wc -l) total committers over $(git log --format=oneline $PREV..HEAD | wc -l) commits since $PREV (), including $(i=0; git shortlog -s $PREV..HEAD | cut -c8- | fgrep ' ' | while read nm; do i=$(($i + 1)); if [ $i -ge 2 ]; then echo -n ', '; fi; echo -n "$nm"; done)."
diff --git a/doc/release/monthly/2017-04-05.html b/doc/release/monthly/2017-04-05.html
index 867e823..8b1c058 100755
--- a/doc/release/monthly/2017-04-05.html
+++ b/doc/release/monthly/2017-04-05.html
@@ -11,7 +11,7 @@ href="https://gopherjs.org">GopherJS</a> to help build the web user interface.
This enabled the addition of two new features in the web UI: <b>Download</b> and
<b>Share</b>. Both actions are available in the side bar whenever an item
representing a file is selected. The "Download" button packs all the selected items in a zip
-archive and dowloads the archive. The "Share" button creates a share claim for the selected
+archive and downloads the archive. The "Share" button creates a share claim for the selected
item, and displays the link that can be used to share the item with the intended
audience. Both actions only support files for now (no directories), and Sharing
is limited to one item, but these limitations should be addressed soon.
diff --git a/doc/schema/TODO b/doc/schema/TODO
index 4a240c8..e28cc8a 100644
--- a/doc/schema/TODO
+++ b/doc/schema/TODO
@@ -71,7 +71,7 @@ Claim types:
Tagging something:

{"claimType": "add-attribute", //
- "attribute": "tag", // utf-8, should have list of valid attributes names, preferrably not made up by us (open social spec?)
+ "attribute": "tag", // utf-8, should have list of valid attributes names, preferably not made up by us (open social spec?)
"value": "funny", // value that doesn’t have lasting value
"valueRef": "sha1-blobref", // hefty reference to a lasting value

diff --git a/doc/server-config.md b/doc/server-config.md
index c6ee269..a106b06 100644
--- a/doc/server-config.md
+++ b/doc/server-config.md
@@ -220,7 +220,7 @@ not straightforward, so we suggest using one of the other indexers, like MySQL.

The following steps should get you started with MySQL:

-* Dowload and install [MariaDB](https://downloads.mariadb.org/mariadb/5.5.32/)
+* Download and install [MariaDB](https://downloads.mariadb.org/mariadb/5.5.32/)
or [MySQL](http://dev.mysql.com/downloads/windows/installer/) (the latter
requires .NET).
* Edit your server configuration file (if it does not exit yet, running
diff --git a/internal/images/resize/resize.go b/internal/images/resize/resize.go
index 7251dd0..f769765 100644
--- a/internal/images/resize/resize.go
+++ b/internal/images/resize/resize.go
@@ -234,7 +234,7 @@ func HalveInplace(m image.Image) image.Image {
}
}

-// ResampleInplace will resample m inplace, overwritting existing pixel data,
+// ResampleInplace will resample m inplace, overwriting existing pixel data,
// and return a subimage of m sized to w and h.
func ResampleInplace(m image.Image, r image.Rectangle, w, h int) image.Image {
// We don't support scaling up.
diff --git a/internal/video/thumbnail/service.go b/internal/video/thumbnail/service.go
index f7f8a94..49e535a 100644
--- a/internal/video/thumbnail/service.go
+++ b/internal/video/thumbnail/service.go
@@ -58,7 +58,7 @@ type Service struct {
// // command defaults to FFmpegThumbnailer and $uri is replaced by
// // the real value at runtime.
// "command": ["/opt/local/bin/ffmpeg", "-i", "$uri", "pipe:1"],
-// // Maximun number of milliseconds for running the thumbnailing subprocess.
+// // Maximum number of milliseconds for running the thumbnailing subprocess.
// // A zero or negative timeout means no timeout.
// "timeout": 2000,
// // Maximum number of thumbnailing subprocess running at same time.
diff --git a/misc/docker/synology/build_syno.go b/misc/docker/synology/build_syno.go
index 0223c3e..21d6bfe 100644
--- a/misc/docker/synology/build_syno.go
+++ b/misc/docker/synology/build_syno.go
@@ -54,7 +54,7 @@ func main() {

gobin := "/go/bin"
goarch := "amd64"
- // TODO(mpl): figure out the correspondance between all the other arches and the
+ // TODO(mpl): figure out the correspondence between all the other arches and the
// values for the go vars.
if *flagArch == "6281" {
gobin = "/go/bin/linux_arm"
diff --git a/misc/docker/synology/perkeep/SynoBuildConf/build b/misc/docker/synology/perkeep/SynoBuildConf/build
index c97d9ca..7181995 100644
--- a/misc/docker/synology/perkeep/SynoBuildConf/build
+++ b/misc/docker/synology/perkeep/SynoBuildConf/build
@@ -2,6 +2,6 @@
# Copyright 2018 The Perkeep Authors.
# Licensed under the Apache License, Version 2.0

-# TOOD(mpl): remove if not needed
+# TODO(mpl): remove if not needed

exit 0
diff --git a/misc/release/make-release.go b/misc/release/make-release.go
index 965a315..9f66583 100644
--- a/misc/release/make-release.go
+++ b/misc/release/make-release.go
@@ -688,7 +688,7 @@ type stats struct {
NamesList string
}

-// returns commiters names mapped by e-mail, uniqued first by e-mail, then by name.
+// returns committers names mapped by e-mail, uniqued first by e-mail, then by name.
// When uniquing, higher count of commits wins.
func committers() (map[string]string, error) {
cmd := exec.Command("git", "shortlog", "-n", "-e", "-s", *flagStatsFrom+".."+revOrHEAD())
diff --git a/pkg/blob/fetcher.go b/pkg/blob/fetcher.go
index a5d4cb6..99495c1 100644
--- a/pkg/blob/fetcher.go
+++ b/pkg/blob/fetcher.go
@@ -44,7 +44,7 @@ type Fetcher interface {
// The caller must close blob.
//
// The provided context is used until blob is closed and its
- // cancelation should but may not necessarily cause reads from
+ // cancellation should but may not necessarily cause reads from
// blob to fail with an error.
Fetch(context.Context, Ref) (blob io.ReadCloser, size uint32, err error)
}
diff --git a/pkg/blobserver/azure/azure.go b/pkg/blobserver/azure/azure.go
index 74542f0..a347e21 100644
--- a/pkg/blobserver/azure/azure.go
+++ b/pkg/blobserver/azure/azure.go
@@ -106,7 +106,7 @@ func newFromConfig(_ blobserver.Loader, config jsonconfig.Obj) (blobserver.Stora
}

func init() {
- // It's assumed the MaxBlobSize won't change in the forseeable future.
+ // It's assumed the MaxBlobSize won't change in the foreseeable future.
// However, just in case it does, let's be aware that the current implementation doesn't support it.
// Azure itself can support it by splitting up requests in multiple parts but that's more work which is not yet needed.
if constants.MaxBlobSize > 64000000 {
diff --git a/pkg/blobserver/blobpacked/blobpacked.go b/pkg/blobserver/blobpacked/blobpacked.go
index 7fc364f..9cfb3b4 100644
--- a/pkg/blobserver/blobpacked/blobpacked.go
+++ b/pkg/blobserver/blobpacked/blobpacked.go
@@ -407,7 +407,7 @@ func (s *storage) checkLargeIntegrity() (RecoveryMode, error) {
// zipRef in meta that actually does not exist in s.large.
xbr, ok := blob.Parse(strings.TrimPrefix(metaKey, zipMetaPrefix))
if !ok {
- return fmt.Errorf("boggus key in z: row: %q", metaKey)
+ return fmt.Errorf("bogus key in z: row: %q", metaKey)
}
extra = append(extra, xbr)
// iterate meta once more at the same storage enumeration point
@@ -1204,7 +1204,7 @@ func (pk *packer) pack(ctx context.Context) error {
return err
}

- // TODO: decide as a fuction of schemaRefs and dataRefs
+ // TODO: decide as a function of schemaRefs and dataRefs
// already in s.large whether it makes sense to still compact
// this from a savings standpoint. For now we just always do.
// Maybe we'd have knobs in the future. Ideally not.
diff --git a/pkg/blobserver/blobpacked/wholefetch.go b/pkg/blobserver/blobpacked/wholefetch.go
index f17a6e1..8c0c98e 100644
--- a/pkg/blobserver/blobpacked/wholefetch.go
+++ b/pkg/blobserver/blobpacked/wholefetch.go
@@ -102,7 +102,7 @@ func (s *storage) OpenWholeRef(wholeRef blob.Ref, offset int64) (rc io.ReadClose
sort.Sort(byZipIndex(parts))
for i, zp := range parts {
if zp.idx != uint32(i) {
- log.Printf("blobpacked: discontigous or overlapping index for wholeref %v", wholeRef)
+ log.Printf("blobpacked: discontiguous or overlapping index for wholeref %v", wholeRef)
return nil, 0, os.ErrNotExist
}
}
diff --git a/pkg/blobserver/diskpacked/diskpacked.go b/pkg/blobserver/diskpacked/diskpacked.go
index 29f1b5f..b341cc5 100644
--- a/pkg/blobserver/diskpacked/diskpacked.go
+++ b/pkg/blobserver/diskpacked/diskpacked.go
@@ -85,7 +85,7 @@ type storage struct {
index sorted.KeyValue
maxFileSize int64

- writeLock io.Closer // Provided by lock.Lock, and guards other processes from accesing the file open for writes.
+ writeLock io.Closer // Provided by lock.Lock, and guards other processes from accessing the file open for writes.

*local.Generationer

diff --git a/pkg/blobserver/storagetest/storagetest.go b/pkg/blobserver/storagetest/storagetest.go
index 2666704..54f785e 100644
--- a/pkg/blobserver/storagetest/storagetest.go
+++ b/pkg/blobserver/storagetest/storagetest.go
@@ -459,7 +459,7 @@ func TestStreamer(t *testing.T, bs blobserver.BlobStreamer, opts ...StreamerTest
}
}

- // See if, without cancelation, it yields the right
+ // See if, without cancellation, it yields the right
// result and without errors.
ch := make(chan blobserver.BlobAndToken)
errCh := make(chan error, 1)
@@ -508,7 +508,7 @@ func TestStreamer(t *testing.T, bs blobserver.BlobStreamer, opts ...StreamerTest
return
}

- // Next, the "complex pass": test a cancelation at each point,
+ // Next, the "complex pass": test a cancellation at each point,
// to test that resume works properly.
//
// Basic strategy:
diff --git a/pkg/fs/fs.go b/pkg/fs/fs.go
index 5af6552..9e34df5 100644
--- a/pkg/fs/fs.go
+++ b/pkg/fs/fs.go
@@ -377,7 +377,7 @@ func (fs *CamliFileSystem) newNodeFromBlobRef(root blob.Ref) (fusefs.Node, error
return n, nil

case schema.TypePermanode:
- // other mutDirs listed in the default fileystem have names and are displayed
+ // other mutDirs listed in the default filesystem have names and are displayed
return &mutDir{fs: fs, permanode: root, name: "-"}, nil
}

diff --git a/pkg/importer/importer.go b/pkg/importer/importer.go
index af298ed..df6ec6a 100644
--- a/pkg/importer/importer.go
+++ b/pkg/importer/importer.go
@@ -839,7 +839,7 @@ func (im *importer) URL() string { return im.host.ImporterBaseURL() + im.name }
func (im *importer) ShowClientAuthEditForm() bool {
if im.StaticConfig() {
// Don't expose the server's statically-configured client secret
- // to the user. (e.g. a hosted multi-user configuation)
+ // to the user. (e.g. a hosted multi-user configuration)
return false
}
return im.props.NeedsAPIKey
diff --git a/pkg/importer/oauth.go b/pkg/importer/oauth.go
index 5e946ee..c0697b5 100644
--- a/pkg/importer/oauth.go
+++ b/pkg/importer/oauth.go
@@ -87,7 +87,7 @@ func (OAuth2) CallbackURLParameters(acctRef blob.Ref) url.Values {
func (OAuth2) RedirectURL(imp Importer, ctx *SetupContext) string {
// We strip our callback URL of its query component, because the Redirect URI
// we send during authorization has to match exactly the registered redirect
- // URI(s). This query component should be stored in the "state" paremeter instead.
+ // URI(s). This query component should be stored in the "state" parameter instead.
// See http://tools.ietf.org/html/rfc6749#section-3.1.2.2
fullCallback := ctx.CallbackURL()
queryPart := imp.CallbackURLParameters(ctx.AccountNode.PermanodeRef())
diff --git a/pkg/importer/picasa/picasa.go b/pkg/importer/picasa/picasa.go
index 9fdde30..3133cb2 100644
--- a/pkg/importer/picasa/picasa.go
+++ b/pkg/importer/picasa/picasa.go
@@ -169,7 +169,7 @@ func (im imp) ServeCallback(w http.ResponseWriter, r *http.Request, ctx *importe
return
}

- log.Printf("importer/picasa: got exhanged token.")
+ log.Printf("importer/picasa: got exchange token.")
picagoCtx := context.WithValue(ctx, ctxutil.HTTPClient, oauthConfig.Client(ctx, token))

userInfo, err := im.getUserInfo(picagoCtx)
diff --git a/pkg/importer/plaid/README b/pkg/importer/plaid/README
index b7914a9..ee114f0 100644
--- a/pkg/importer/plaid/README
+++ b/pkg/importer/plaid/README
@@ -2,7 +2,7 @@ Plaid Importer
==============

Plaid (plaid.com) is a service that allows users to connect to financial
-institutions (namely credit card providers) and retreive financial
+institutions (namely credit card providers) and retrieve financial
transactions in a uniform format.

To use:
diff --git a/pkg/importer/twitter/twitter.go b/pkg/importer/twitter/twitter.go
index a8877d1..d056644 100644
--- a/pkg/importer/twitter/twitter.go
+++ b/pkg/importer/twitter/twitter.go
@@ -66,7 +66,7 @@ const (
// permanode and subsequent importers can stop early.
runCompleteVersion = "5"

- // acctAttrTweetZip specifies an optional attribte for the account permanode.
+ // acctAttrTweetZip specifies an optional attribute for the account permanode.
// If set, it should be of a "file" schema blob referencing the tweets.zip
// file that Twitter makes available for the full archive download.
// The Twitter API doesn't go back forever in time, so if you started using
@@ -76,7 +76,7 @@ const (
// ... and re-do an import.
acctAttrTweetZip = "twitterArchiveZipFileRef"

- // acctAttrImportLikes specifies an optional attribte for the account permanode.
+ // acctAttrImportLikes specifies an optional attribute for the account permanode.
// If set to true likes are imported via the twitter API.
// You can enable importing likes like this:
// $ pk-put attr <acct-permanode> twitterImportLikes true
diff --git a/pkg/index/corpus.go b/pkg/index/corpus.go
index 6baf03f..396d13c 100644
--- a/pkg/index/corpus.go
+++ b/pkg/index/corpus.go
@@ -1138,7 +1138,7 @@ func (c *Corpus) pnTimeAttr(pn blob.Ref, attr string) (t time.Time, ok bool) {
// PermanodeTime returns the time of the content in permanode.
func (c *Corpus) PermanodeTime(pn blob.Ref) (t time.Time, ok bool) {
// TODO(bradfitz): keep this time property cached on the permanode / files
- // TODO(bradfitz): finish implmenting all these
+ // TODO(bradfitz): finish implementing all these

// Priorities:
// -- Permanode explicit "camliTime" property
diff --git a/pkg/index/index.go b/pkg/index/index.go
index fe7c494..719b266 100644
--- a/pkg/index/index.go
+++ b/pkg/index/index.go
@@ -571,7 +571,7 @@ func (x *Index) Reindex() error {
return nil
}

-// integrityCheck enumerates blobs through x.blobSource during timemout, and
+// integrityCheck enumerates blobs through x.blobSource during timeout, and
// verifies for each of them that it has a meta row in the index. It logs a message
// if any of them is not found. It only returns an error if something went wrong
// during the enumeration.
diff --git a/pkg/index/keys.go b/pkg/index/keys.go
index e4c5eb9..30b4555 100644
--- a/pkg/index/keys.go
+++ b/pkg/index/keys.go
@@ -398,7 +398,7 @@ func containsUnsafeRawStrByte(s string) bool {
return true
}
if r == '%' || r == '+' {
- // Could be interpretted as URL-encoded
+ // Could be interpreted as URL-encoded
return true
}
}
diff --git a/pkg/index/memindex.go b/pkg/index/memindex.go
index 1ca0457..b1d0f0f 100644
--- a/pkg/index/memindex.go
+++ b/pkg/index/memindex.go
@@ -31,7 +31,7 @@ func init() {
func NewMemoryIndex() *Index {
ix, err := New(sorted.NewMemoryKeyValue())
if err != nil {
- // Nothing to fail in memory, so worth panicing about
+ // Nothing to fail in memory, so worth panicking about
// if we ever see something.
panic(err)
}
diff --git a/pkg/schema/blob.go b/pkg/schema/blob.go
index e81970d..ebc8c04 100644
--- a/pkg/schema/blob.go
+++ b/pkg/schema/blob.go
@@ -68,7 +68,7 @@ func (b *Blob) BlobRef() blob.Ref { return b.br }
// JSON returns the JSON bytes of the schema blob.
func (b *Blob) JSON() string { return b.str }

-// Blob returns itself, so it satisifies the AnyBlob interface.
+// Blob returns itself, so it satisfies the AnyBlob interface.
func (b *Blob) Blob() *Blob { return b }

// PartsSize returns the number of bytes represented by the "parts" field.
@@ -319,7 +319,7 @@ func (sl StaticSymlink) SymlinkTargetString() string {
}

// AsStaticSymlink returns the StaticFile as a StaticSymlink if the
-// StaticFile represents a symlink. Othwerwise, it returns the zero
+// StaticFile represents a symlink. Otherwise, it returns the zero
// value of StaticSymlink and false.
func (sf StaticFile) AsStaticSymlink() (s StaticSymlink, ok bool) {
if sf.b.ss.Type == TypeSymlink {
@@ -439,7 +439,7 @@ func (bb *Builder) Blob() *Blob {
}
}

-// Builder returns a clone of itself and satisifies the Buildable interface.
+// Builder returns a clone of itself and satisfies the Buildable interface.
func (bb *Builder) Builder() *Builder {
return &Builder{clone(bb.m).(map[string]interface{})}
}
diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
index 98a3e2b..a4d7637 100644
--- a/pkg/schema/schema.go
+++ b/pkg/schema/schema.go
@@ -633,7 +633,7 @@ func (bb *Builder) SetStaticSetMembers(members []blob.Ref) []*Blob {
}
}

- // Deal with the rest (of the euclidian division)
+ // Deal with the rest (of the euclidean division)
if perSubset*subsetsNumber < len(members) {
ss := NewStaticSet()
ss.SetStaticSetMembers(members[perSubset*subsetsNumber:])
diff --git a/pkg/schema/schema_test.go b/pkg/schema/schema_test.go
index a2bad1b..f12b293 100644
--- a/pkg/schema/schema_test.go
+++ b/pkg/schema/schema_test.go
@@ -53,7 +53,7 @@ func TestJSON(t *testing.T) {
// TODO: test it parses back

if !strings.HasPrefix(json, expectedHeader) {
- t.Errorf("JSON does't start with expected header.")
+ t.Errorf("JSON doesn't start with expected header.")
}

}
diff --git a/pkg/search/query.go b/pkg/search/query.go
index e06eca8..877f87e 100644
--- a/pkg/search/query.go
+++ b/pkg/search/query.go
@@ -92,7 +92,7 @@ func (t *SortType) UnmarshalJSON(v []byte) error {
}

type SearchQuery struct {
- // Exactly one of Expression or Contraint must be set.
+ // Exactly one of Expression or Constraint must be set.
// If an Expression is set, it's compiled to a Constraint.

// Expression is a textual search query in minimal form,
diff --git a/pkg/server/image.go b/pkg/server/image.go
index 85dedcb..b6d4d6e 100644
--- a/pkg/server/image.go
+++ b/pkg/server/image.go
@@ -216,7 +216,7 @@ type formatAndImage struct {
}

// imageConfigFromReader calls image.DecodeConfig on r. It returns an
-// io.Reader that is the concatentation of the bytes read and the remaining r,
+// io.Reader that is the concatenation of the bytes read and the remaining r,
// the image configuration, and the error from image.DecodeConfig.
// If the image is HEIC, and its config was decoded properly (but partially,
// because we don't do ColorModel yet), it returns images.ErrHEIC.
diff --git a/pkg/sorted/buffer/buffer.go b/pkg/sorted/buffer/buffer.go
index c2d1bc6..31d0bdd 100644
--- a/pkg/sorted/buffer/buffer.go
+++ b/pkg/sorted/buffer/buffer.go
@@ -28,7 +28,7 @@ import (
"perkeep.org/pkg/sorted"
)

-// New returnes a sorted.KeyValue implementation that adds a Flush
+// New returns a sorted.KeyValue implementation that adds a Flush
// method to flush the buffer to the backing storage. A flush will
// also be performed when maxBufferBytes are reached. If
// maxBufferBytes <= 0, no automatic flushing is performed.
diff --git a/pkg/types/serverconfig/config.go b/pkg/types/serverconfig/config.go
index a94bcde..fb59f0b 100644
--- a/pkg/types/serverconfig/config.go
+++ b/pkg/types/serverconfig/config.go
@@ -29,7 +29,7 @@ import (
// Perkeep components.
type Config struct {
Auth string `json:"auth"` // auth scheme and values (ex: userpass:foo:bar).
- BaseURL string `json:"baseURL,omitempty"` // Base URL the server advertizes. For when behind a proxy.
+ BaseURL string `json:"baseURL,omitempty"` // Base URL the server advertises. For when behind a proxy.
Listen string `json:"listen"` // address (of the form host|ip:port) on which the server will listen on.

// CamliNetIP is the optional internet-facing IP address for this
diff --git a/server/perkeepd/perkeepd.go b/server/perkeepd/perkeepd.go
index a0f11d4..246fa72 100644
--- a/server/perkeepd/perkeepd.go
+++ b/server/perkeepd/perkeepd.go
@@ -411,7 +411,7 @@ func Main() {
setBlobpackedRecovery()

// In case we're running in a Docker container with no
- // filesytem from which to load the root CAs, this
+ // filesystem from which to load the root CAs, this
// conditionally installs a static set if necessary. We do
// this before we load the config file, which might come from
// an https URL. And also before setting up the logging,
diff --git a/server/perkeepd/ui/blob.js b/server/perkeepd/ui/blob.js
index 4835f81..9d3ca9c 100644
--- a/server/perkeepd/ui/blob.js
+++ b/server/perkeepd/ui/blob.js
@@ -80,7 +80,7 @@ cam.blob.refFromDOMBlob = function(blob, doLegacySHA1) {
return refs;
};

-// Creates an instance of the currently recommened hash function.
+// Creates an instance of the currently recommended hash function.
// @return {!goog.crypt.Hash'}
cam.blob.createHash = function() {
return new goog.crypt.Sha224();
diff --git a/server/perkeepd/ui/dir_container.js b/server/perkeepd/ui/dir_container.js
index cb15072..b3d8bb9 100644
--- a/server/perkeepd/ui/dir_container.js
+++ b/server/perkeepd/ui/dir_container.js
@@ -71,7 +71,7 @@ cam.DirChildrenSession = function(
// Makes sure there's only ever one query at most in flight.
this.pending_ = false;

- // Wether we've already gotten all the descendants of ParentDir.
+ // Whether we've already gotten all the descendants of ParentDir.
this.isComplete_ = false;
};

@@ -189,7 +189,7 @@ cam.DirChildrenSession.prototype.mergeResults_ = function(results) {
this.isComplete_ = true;
}
// Reject "stale" results. They should never occur though, since we
- // supress with this.pending_, and we request everything in order.
+ // suppress with this.pending_, and we request everything in order.
if (this.meta_[lastInResults]) {
return;
}
diff --git a/server/perkeepd/ui/index.js b/server/perkeepd/ui/index.js
index fcb7a59..8ca6f34 100644
--- a/server/perkeepd/ui/index.js
+++ b/server/perkeepd/ui/index.js
@@ -181,7 +181,7 @@ cam.IndexPage = React.createClass({
// messageDialogVisible to true.
messageDialogContents: null,
messageDialogVisible: false,
- // dialogWidth and dialogHeight should be set to accomodate the size of
+ // dialogWidth and dialogHeight should be set to accommodate the size of
// the text message we display in the dialog.
dialogWidth: 0,
dialogHeight: 0,
@@ -962,7 +962,7 @@ cam.IndexPage = React.createClass({
}

if (progress.Assembled) {
- this.updateImportShareDialog_("File successfully imporoted as", blobRef)
+ this.updateImportShareDialog_("File successfully imported as", blobRef)
return;
}
this.updateImportShareDialog_(`Done - ${progress.FilesCopied}/${progress.FilesSeen} files imported under`, blobRef);
@@ -1502,7 +1502,7 @@ cam.IndexPage = React.createClass({
);
}.bind(this);

- // mkdir creates a new directory blob, whith children composing its
+ // mkdir creates a new directory blob, with children composing its
// static-set, and uploads it. It passes to cb the blobRef of the new
// directory.
const mkdir = function(children, cb) {
diff --git a/server/perkeepd/ui/mapquery.js b/server/perkeepd/ui/mapquery.js
index 8480c0d..baa70d3 100644
--- a/server/perkeepd/ui/mapquery.js
+++ b/server/perkeepd/ui/mapquery.js
@@ -264,7 +264,7 @@ cam.MapQuery = function(
// expr is the search query expression.
this.expr_ = expr;

- // callback is the function to run on the JSON-ified serach results, if the
+ // callback is the function to run on the JSON-ified search results, if the
// search was successful.
this.callback_ = callback;

@@ -281,7 +281,7 @@ cam.MapQuery = function(
// nextZoom is the location area that is requested for the next query.
this.nextZoom_ = null;

- // zoom is the location area that was requested for the last successfull query.
+ // zoom is the location area that was requested for the last successful query.
this.zoom_ = null;
};

diff --git a/server/perkeepd/ui/server_connection.js b/server/perkeepd/ui/server_connection.js
index 4d16a27..d2364aa 100644
--- a/server/perkeepd/ui/server_connection.js
+++ b/server/perkeepd/ui/server_connection.js
@@ -125,7 +125,7 @@ cam.ServerConnection.prototype.getConfig = function() {

// @param {string} blobref blobref whose contents we want.
// @param {Function} success callback with data.
-// @param {?Function} opt_fail optional failure calback
+// @param {?Function} opt_fail optional failure callback
cam.ServerConnection.prototype.getBlobContents = function(blobref, success, opt_fail) {
var path = goog.uri.utils.appendPath(
this.config_.blobRoot, 'camli/' + blobref
@@ -163,7 +163,7 @@ cam.ServerConnection.prototype.handleXhrResponseJson_ = function(callbacks, e) {
};

// @param {Function} success callback with data.
-// @param {?Function} opt_fail optional failure calback
+// @param {?Function} opt_fail optional failure callback
cam.ServerConnection.prototype.discoSignRoot = function(success, opt_fail) {
var path = goog.uri.utils.appendPath(this.config_.jsonSignRoot, '/camli/sig/discovery');
this.sendXhr_(path, goog.bind(this.handleXhrResponseJson_, this, {success: success, fail: opt_fail}));
@@ -181,7 +181,7 @@ cam.ServerConnection.prototype.serverStatus = function(success) {

// @param {string} shareURL
// @param {Function} success callback.
-// @param {?Function} opt_fail optional failure calback.
+// @param {?Function} opt_fail optional failure callback.
cam.ServerConnection.prototype.importShare = function(shareURL, success, opt_fail) {
this.sendXhr_(
goog.uri.utils.appendPath(this.config_.uiRoot, 'importshare'),
@@ -204,7 +204,7 @@ cam.ServerConnection.prototype.importShareStatus = function(success) {

// @param {string} blobref root of the tree
// @param {Function} success callback with data.
-// @param {?Function} opt_fail optional failure calback
+// @param {?Function} opt_fail optional failure callback
cam.ServerConnection.prototype.getFileTree = function(blobref, success, opt_fail) {
// TODO(mpl): do it relatively to a discovered root?
var path = "./tree/" + blobref;
@@ -736,7 +736,7 @@ cam.ServerConnection.prototype.handleUpload_ = function(file, contentsBlobRef, c

// @param {List} wholeDigestRefs file contents digests (current hash in use, then optionally legacy SHA-1 hash).
// @param {Function} success callback with data.
-// @param {?Function} opt_fail optional failure calback
+// @param {?Function} opt_fail optional failure callback
cam.ServerConnection.prototype.findExistingFileSchemas_ = function(wholeDigestRefs, success, opt_fail) {
var path = goog.uri.utils.appendPath(this.config_.searchRoot, 'camli/search/files');
for (var i=0; i<wholeDigestRefs.length; i++) {
diff --git a/website/content/code.md b/website/content/code.md
index 9576aa4..c916899 100644
--- a/website/content/code.md
+++ b/website/content/code.md
@@ -14,7 +14,7 @@ Perkeep is built so that other apps can securely access and store
data without running alongside it. Perkeep is the perfect backing
store for other web apps and CMSes.

-Detailed documention on the HTTP blob retrieval protocol can be found at
+Detailed documentation on the HTTP blob retrieval protocol can be found at
[the protocol documentation](/doc/protocol). The [client](/pkg/client),
[search](/pkg/search) and [schema](/pkg/schema) packages are also a good
place to start.
diff --git a/website/pk-web/email.go b/website/pk-web/email.go
index 264d79c..42d60cd 100644
--- a/website/pk-web/email.go
+++ b/website/pk-web/email.go
@@ -107,7 +107,7 @@ func emailCommit(dir, hash string) (err error) {
cmd := execGit(dir, "show", nil, "show", hash)
body, err = cmd.CombinedOutput()
if err != nil {
- return fmt.Errorf("error runnning git show: %v\n%s", err, body)
+ return fmt.Errorf("error running git show: %v\n%s", err, body)
}
return nil
}); err != nil {
@@ -123,7 +123,7 @@ func emailCommit(dir, hash string) (err error) {
cmd := execGit(dir, "show_pretty", nil, "show", "--pretty=oneline", hash)
out, err = cmd.Output()
if err != nil {
- return fmt.Errorf("error runnning git show_pretty: %v\n%s", err, out)
+ return fmt.Errorf("error running git show_pretty: %v\n%s", err, out)
}
return nil
}); err != nil {
diff --git a/website/pk-web/godoc.go b/website/pk-web/godoc.go
index d40d34a..9df8813 100644
--- a/website/pk-web/godoc.go
+++ b/website/pk-web/godoc.go
@@ -77,7 +77,7 @@ var godocFmap = template.FuncMap{
"filename": filenameFunc,
"repeat": strings.Repeat,

- // accss to FileInfos (directory listings)
+ // access to FileInfos (directory listings)
"fileInfoName": fileInfoNameFunc,
"fileInfoTime": fileInfoTimeFunc,

diff --git a/website/talks/2011-05-07-Camlistore-Sao-Paolo/prettify.js b/website/talks/2011-05-07-Camlistore-Sao-Paolo/prettify.js
index 339b05d..64bb792 100644
--- a/website/talks/2011-05-07-Camlistore-Sao-Paolo/prettify.js
+++ b/website/talks/2011-05-07-Camlistore-Sao-Paolo/prettify.js
@@ -589,7 +589,7 @@ window['PR']
* recognized.
*
* Shortcut is an optional string of characters, any of which, if the first
- * character, gurantee that this pattern and only this pattern matches.
+ * character, guarantee that this pattern and only this pattern matches.
*
* @param {Array} shortcutStylePatterns patterns that always start with
* a known character. Must have a shortcut string.