misc: Fix a few typos

CHANGELOG.md

@@ -130,7 +130,7 @@ remove them before updating.
   - Update badgerds to fix i386 windows build ([ipfs/go-ipfs#4464](https://github.com/ipfs/go-ipfs/pull/4464))
   - Only construct bitswap event loggable if necessary ([ipfs/go-ipfs#4533](https://github.com/ipfs/go-ipfs/pull/4533))
   - Ensure that flush on the mfs root flushes its directory ([ipfs/go-ipfs#4509](https://github.com/ipfs/go-ipfs/pull/4509))
-  - Fix defered unlock of pin lock in AddR ([ipfs/go-ipfs#4562](https://github.com/ipfs/go-ipfs/pull/4562))
+  - Fix deferred unlock of pin lock in AddR ([ipfs/go-ipfs#4562](https://github.com/ipfs/go-ipfs/pull/4562))
   - Fix iOS builds ([ipfs/go-ipfs#4610](https://github.com/ipfs/go-ipfs/pull/4610))
   - Calling repo gc now frees up space with badgerds ([ipfs/go-ipfs#4578](https://github.com/ipfs/go-ipfs/pull/4578))
   - Fix leak in bitswap sessions shutdown ([ipfs/go-ipfs#4658](https://github.com/ipfs/go-ipfs/pull/4658))
@@ -282,7 +282,7 @@ wantlist updates to every connected bitswap partner, as well as searching the
 DHT for providers less frequently. In future releases we will migrate over more
 ipfs commands to take advantage of bitswap sessions. As nodes update to this
 and future versions, expect to see idle bandwidth usage on the ipfs network
-go down noticably.
+go down noticeably.
 
 The never ending effort to reduce resource consumption had a few important
 updates this release. First, the bitswap sessions changes discussed above will
@@ -332,7 +332,7 @@ You can read more on this topic in [Plugin docs](docs/plugins.md)
 
 In order to simplify its integration with fs-repo-migrations, we've switched
 the ipfs/go-ipfs docker image from a musl base to a glibc base. For most users
-this will not be noticable, but if you've been building your own images based
+this will not be noticeable, but if you've been building your own images based
 off this image, you'll have to update your dockerfile. We recommend a
 multi-stage dockerfile, where the build stage is based off of a regular Debian or
 other glibc-based image, and the assembly stage is based off of the ipfs/go-ipfs
@@ -1010,14 +1010,14 @@ This is the first Release Candidate. Unless there are vulnerabilities or regress
 
 ### 0.4.2 - 2016-05-17
 
-This is a patch release which fixes perfomance and networking bugs in go-libp2p,
+This is a patch release which fixes performance and networking bugs in go-libp2p,
 You should see improvements in CPU and RAM usage, as well as speed of object lookups.
 There are also a few other nice improvements.
 
 * Notable Fixes
   * Set a deadline for dialing attempts. This prevents a node from accumulating
     failed connections. (@whyrusleeping)
-  * Avoid unneccessary string/byte conversions in go-multihash. (@whyrusleeping)
+  * Avoid unnecessary string/byte conversions in go-multihash. (@whyrusleeping)
   * Fix a deadlock around the yamux stream muxer. (@whyrusleeping)
   * Fix a bug that left channels open, causing hangs. (@whyrusleeping)
   * Fix a bug around yamux which caused connection hangs. (@whyrusleeping)
@@ -1077,7 +1077,7 @@ insignificant) features. The primary reason for this release is the listener
 hang bugfix that was shipped in the 0.4.0 release.
 
 * Features
-  * implementated ipfs object diff (@whyrusleeping)
+  * implemented ipfs object diff (@whyrusleeping)
   * allow promises (used in get, refs) to fail (@whyrusleeping)
 
 * Tool changes
@@ -1166,7 +1166,7 @@ on the networking layer.
   * General
     * Add support for HTTP OPTIONS requests. (@lidel)
     * Add `ipfs diag cmds` to view active API requests (@whyrusleeping)
-    * Add an `IPFS_LOW_MEM` environment veriable which relaxes Bitswap's memory usage. (@whyrusleeping)
+    * Add an `IPFS_LOW_MEM` environment variable which relaxes Bitswap's memory usage. (@whyrusleeping)
     * The Docker image now lives at `ipfs/go-ipfs` and has been completely reworked. (@lgierth)
 * Security fixes
   * The gateway path prefix added in v0.3.10 was vulnerable to cross-site
@@ -1351,15 +1351,15 @@ in the future, it will be enabled by default.
 
 This patch update includes a good number of bugfixes, notably, it fixes
 builds on windows, and puts newlines between streaming json objects for a
-proper nsjon format.
+proper ndjson format.
 
 * Features
   * Writable gateway enabled again (@cryptix)
 
 * Bugfixes
   * fix windows builds (@whyrusleeping)
   * content type on command responses default to text (@whyrusleeping)
-  * add check to makefile to ensure windows builds dont fail silently (@whyrusleeping)
+  * add check to makefile to ensure windows builds don't fail silently (@whyrusleeping)
   * put newlines between streaming json output objects (@whyrusleeping)
   * fix streaming output to flush per write (@whyrusleeping)
   * purposely fail builds pre go1.5 (@whyrusleeping)
@@ -1603,13 +1603,13 @@ This patch update fixes various issues, in particular:
 * ipns resolution timeout bug fix by @whyrusleeping
 * new cluster tests with iptb by @whyrusleeping
 * fix log callstack printing bug by @whyrusleeping
-* document bash completiong by @dylanPowers
+* document bash completion by @dylanPowers
 
 ### 0.3.2 - 2015-04-22
 
 This patch update implements multicast dns as well as fxing a few test issues.
 
-* implment mdns peer discovery @whyrusleeping
+* implement mdns peer discovery @whyrusleeping
 * fix mounting issues in sharness tests @chriscool
 
 ### 0.3.1 - 2015-04-21

README.md

@@ -317,7 +317,7 @@ Please direct general questions and help requests to our
 [forum](https://discuss.ipfs.io) or our IRC channel (freenode #ipfs).
 
 If you believe you've found a bug, check the [issues list](https://github.com/ipfs/go-ipfs/issues)
-and, if you dont see your problem there, either come talk to us on IRC (freenode #ipfs) or
+and, if you don't see your problem there, either come talk to us on IRC (freenode #ipfs) or
 file an issue of your own!
 
 ## Contributing

bin/dist_get

@@ -9,7 +9,7 @@ have_binary() {
 	type "$1" > /dev/null 2> /dev/null
 }
 
-check_writeable() {
+check_writable() {
 	printf "" > "$1" && rm "$1"
 }
 
@@ -39,7 +39,7 @@ download() {
 
 	test "$#" -eq "2" || die "download requires exactly two arguments, was given $@"
 
-	if ! check_writeable "$dl_output"; then
+	if ! check_writable "$dl_output"; then
 		die "download error: cannot write to $dl_output"
 	fi
 
@@ -65,7 +65,7 @@ unarchive() {
 	fi
 	ua_outfile="$ua_outfile$ua_binpostfix"
 
-	if ! check_writeable "$ua_outfile"; then
+	if ! check_writable "$ua_outfile"; then
 		die "unarchive error: cannot write to $ua_outfile"
 	fi
 

cmd/ipfs/init.go

@@ -138,7 +138,7 @@ func doInit(out io.Writer, repoRoot string, empty bool, nBitsForKeypair int, con
 		return err
 	}
 
-	if err := checkWriteable(repoRoot); err != nil {
+	if err := checkWritable(repoRoot); err != nil {
 		return err
 	}
 
@@ -178,7 +178,7 @@ func doInit(out io.Writer, repoRoot string, empty bool, nBitsForKeypair int, con
 	return initializeIpnsKeyspace(repoRoot)
 }
 
-func checkWriteable(dir string) error {
+func checkWritable(dir string) error {
 	_, err := os.Stat(dir)
 	if err == nil {
 		// dir exists, make sure we can write to it
@@ -195,7 +195,7 @@ func checkWriteable(dir string) error {
 	}
 
 	if os.IsNotExist(err) {
-		// dir doesnt exist, check that we can create it
+		// dir doesn't exist, check that we can create it
 		return os.Mkdir(dir, 0775)
 	}
 

cmd/ipfs/main.go

@@ -101,7 +101,7 @@ func mainRet() int {
 		}
 	}
 
-	// output depends on excecutable name passed in os.Args
+	// output depends on executable name passed in os.Args
 	// so we need to make sure it's stable
 	os.Args[0] = "ipfs"
 
@@ -235,7 +235,7 @@ func commandDetails(path []string, root *cmds.Command) (*cmdDetails, error) {
 	return &details, nil
 }
 
-// commandShouldRunOnDaemon determines, from commmand details, whether a
+// commandShouldRunOnDaemon determines, from command details, whether a
 // command ought to be executed on an ipfs daemon.
 //
 // It returns a client if the command should be executed on a daemon and nil if
@@ -257,7 +257,7 @@ func commandShouldRunOnDaemon(details cmdDetails, req *cmds.Request, root *cmds.
 	}
 
 	// at this point need to know whether api is running. we defer
-	// to this point so that we dont check unnecessarily
+	// to this point so that we don't check unnecessarily
 
 	// did user specify an api to use for this command?
 	apiAddrStr, _ := req.Options[coreCmds.ApiOption].(string)

cmd/ipfs/util/ulimit_freebsd.go

@@ -9,7 +9,7 @@ import (
 func init() {
 	supportsFDManagement = true
 	getLimit = freebsdGetLimit
-	setLimit = freebdsSetLimit
+	setLimit = freebsdSetLimit
 }
 
 func freebsdGetLimit() (int64, int64, error) {
@@ -18,7 +18,7 @@ func freebsdGetLimit() (int64, int64, error) {
 	return rlimit.Cur, rlimit.Max, err
 }
 
-func freebdsSetLimit(soft int64, max int64) error {
+func freebsdSetLimit(soft int64, max int64) error {
 	rlimit := unix.Rlimit{
 		Cur: soft,
 		Max: max,

cmd/seccat/seccat.go

@@ -29,7 +29,7 @@ import (
 var verbose = false
 
 // Usage prints out the usage of this module.
-// Assumes flags use go stdlib flag pacakage.
+// Assumes flags use go stdlib flag package.
 var Usage = func() {
 	text := `seccat - secure netcat in Go
 

commands/request.go

@@ -26,8 +26,8 @@ type Context struct {
 	ConstructNode func() (*core.IpfsNode, error)
 }
 
-// GetConfig returns the config of the current Command exection
-// context. It may load it with the providied function.
+// GetConfig returns the config of the current Command execution
+// context. It may load it with the provided function.
 func (c *Context) GetConfig() (*config.Config, error) {
 	var err error
 	if c.config == nil {
@@ -39,7 +39,7 @@ func (c *Context) GetConfig() (*config.Config, error) {
 	return c.config, err
 }
 
-// GetNode returns the node of the current Command exection
+// GetNode returns the node of the current Command execution
 // context. It may construct it with the provided function.
 func (c *Context) GetNode() (*core.IpfsNode, error) {
 	var err error

contribute.md

@@ -29,7 +29,7 @@ Please look and conform to our [Go Contribution Guidelines](https://github.com/i
 
 All commits in a PR must pass tests. If they don't, fix the commits and/or [squash them](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits) so that they do pass the tests. This should be done so that we can use git-bisect easily.
 
-We use CI tests which run when you push to your branch. To run the tests locally, you can run any of these: `make build`, `make install`, `make test`, `go test ./...`, depending on what youre looking to do. Generally `go test ./...` is your best bet.
+We use CI tests which run when you push to your branch. To run the tests locally, you can run any of these: `make build`, `make install`, `make test`, `go test ./...`, depending on what you're looking to do. Generally `go test ./...` is your best bet.
 
 ### Branch Names
 

core/builder.go

@@ -229,7 +229,7 @@ func setupNode(ctx context.Context, n *IpfsNode, cfg *BuildCfg) error {
 	internalDag := dag.NewDAGService(bserv.New(n.Blockstore, offline.Exchange(n.Blockstore)))
 	n.Pinning, err = pin.LoadPinner(n.Repo.Datastore(), n.DAG, internalDag)
 	if err != nil {
-		// TODO: we should move towards only running 'NewPinner' explicity on
+		// TODO: we should move towards only running 'NewPinner' explicitly on
 		// node init instead of implicitly here as a result of the pinner keys
 		// not being found in the datastore.
 		// this is kinda sketchy and could cause data loss

core/commands/add.go

@@ -24,7 +24,7 @@ import (
 	cmds "gx/ipfs/QmfAkMSt9Fwzk48QDJecPcwCUjnf2uG7MLnmCGTp4C6ouL/go-ipfs-cmds"
 )
 
-// ErrDepthLimitExceeded indicates that the max depth has been exceded.
+// ErrDepthLimitExceeded indicates that the max depth has been exceeded.
 var ErrDepthLimitExceeded = fmt.Errorf("depth limit exceeded")
 
 const (

core/commands/block.go

@@ -271,7 +271,7 @@ var blockRmCmd = &cmds.Command{
 		Tagline: "Remove IPFS block(s).",
 		ShortDescription: `
 'ipfs block rm' is a plumbing command for removing raw ipfs blocks.
-It takes a list of base58 encoded multihashs to remove.
+It takes a list of base58 encoded multihashes to remove.
 `,
 	},
 	Arguments: []cmdkit.Argument{

core/commands/dag/dag.go

@@ -185,7 +185,7 @@ var DagGetCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
 		Tagline: "Get a dag node from ipfs.",
 		ShortDescription: `
-'ipfs dag get' fetches a dag node from ipfs and prints it out in the specifed
+'ipfs dag get' fetches a dag node from ipfs and prints it out in the specified
 format.
 `,
 	},

core/commands/mount_unix.go

@@ -27,7 +27,7 @@ root will not be listable, as it is virtual. Access known paths directly.
 You may have to create /ipfs and /ipns before using 'ipfs mount':
 
 > sudo mkdir /ipfs /ipns
-> sudo chown ` + "`" + `whoami` + "`" + ` /ipfs /ipns
+> sudo chown $(whoami) /ipfs /ipns
 > ipfs daemon &
 > ipfs mount
 `,
@@ -40,7 +40,7 @@ root will not be listable, as it is virtual. Access known paths directly.
 You may have to create /ipfs and /ipns before using 'ipfs mount':
 
 > sudo mkdir /ipfs /ipns
-> sudo chown ` + "`" + `whoami` + "`" + ` /ipfs /ipns
+> sudo chown $(whoami) /ipfs /ipns
 > ipfs daemon &
 > ipfs mount
 

core/commands/refs.go

@@ -98,7 +98,7 @@ NOTE: List all references recursively by using the flag '-r'.
 		}
 		if edges {
 			if format != "<dst>" {
-				res.SetError(errors.New("using format arguement with edges is not allowed"),
+				res.SetError(errors.New("using format argument with edges is not allowed"),
 					cmdkit.ErrClient)
 				return
 			}

core/coreapi/coreapi.go

@@ -127,7 +127,7 @@ func ParsePath(p string) (coreiface.Path, error) {
 	return &path{path: pp}, nil
 }
 
-// ParseCid parses the path from `c`, retruns the parsed path.
+// ParseCid parses the path from `c`, returns the parsed path.
 func ParseCid(c *cid.Cid) coreiface.Path {
 	return &path{path: ipfspath.FromCid(c), cid: c, root: c}
 }

core/coreapi/interface/options/pin.go

@@ -95,9 +95,9 @@ func (pinType) Indirect() PinLsOption {
 
 // Recursive is an option for Pin.Add which specifies whether to pin an entire
 // object tree or just one object. Default: true
-func (pinOpts) Recursive(recucsive bool) PinAddOption {
+func (pinOpts) Recursive(recursive bool) PinAddOption {
 	return func(settings *PinAddSettings) error {
-		settings.Recursive = recucsive
+		settings.Recursive = recursive
 		return nil
 	}
 }

core/coredag/dagtransl.go

@@ -59,11 +59,11 @@ func ParseInputs(ienc, format string, r io.Reader, mhType uint64, mhLen int) ([]
 }
 
 // AddParser adds DagParser under give input encoding and format
-func (iep InputEncParsers) AddParser(ienv, format string, f DagParser) {
-	m, ok := iep[ienv]
+func (iep InputEncParsers) AddParser(ienc, format string, f DagParser) {
+	m, ok := iep[ienc]
 	if !ok {
 		m = make(FormatParsers)
-		iep[ienv] = m
+		iep[ienc] = m
 	}
 
 	m[format] = f

core/corerepo/pinning.go

@@ -4,7 +4,7 @@ IPFS block services.
 
 IPFS nodes will keep local copies of any object that have either been
 added or requested locally.  Not all of these objects are worth
-preserving forever though, so the node adminstrator can pin objects
+preserving forever though, so the node administrator can pin objects
 they want to keep and unpin objects that they don't care about.
 
 Garbage collection sweeps iterate through the local block store

core/pathresolver.go

@@ -28,7 +28,7 @@ func Resolve(ctx context.Context, nsys namesys.NameSystem, r *resolver.Resolver,
 		defer evt.Done()
 		// resolve ipns paths
 
-		// TODO(cryptix): we sould be able to query the local cache for the path
+		// TODO(cryptix): we should be able to query the local cache for the path
 		if nsys == nil {
 			evt.Append(logging.LoggableMap{"error": ErrNoNamesys.Error()})
 			return nil, ErrNoNamesys

docs/experimental-features.md

@@ -47,7 +47,7 @@ run your daemon with the `--enable-pubsub-experiment` flag. Then use the
 ---
 
 ## Client mode DHT routing
-Allows the dht to be run in a mode that doesnt serve requests to the network,
+Allows the dht to be run in a mode that doesn't serve requests to the network,
 saving bandwidth.
 
 ### State
@@ -183,7 +183,7 @@ and save it to `~/.ipfs/swarm.key` (If you are using a custom `$IPFS_PATH`, put
 it in there instead).
 
 When using this feature, you will not be able to connect to the default bootstrap
-nodes (Since we arent part of your private network) so you will need to set up
+nodes (Since we aren't part of your private network) so you will need to set up
 your own bootstrap nodes.
 
 First, to prevent your node from even trying to connect to the default bootstrap nodes, run:
@@ -215,7 +215,7 @@ configured, the daemon will fail to start.
 ---
 
 ## ipfs p2p
-Allows to tunnel TCP connections through Libp2p sterams
+Allows to tunnel TCP connections through Libp2p streams
 
 ### State
 Experimental
@@ -277,7 +277,7 @@ In order to connect peers QmA and QmB through a relay node QmRelay:
 - Both peers should connect to the relay:
 `ipfs swarm connect /transport/address/ipfs/QmRelay`
 - Peer QmA can then connect to peer QmB using the relay:
-`ipfs swarm connect /ipfs/QmRelay/p2p-cricuit/ipfs/QmB`
+`ipfs swarm connect /ipfs/QmRelay/p2p-circuit/ipfs/QmB`
 
 Peers can also connect with an unspecific relay address, which will
 try to dial through known relays: