Merge branch 'master' into merge-release-v0.29.0

Rules.mk

@@ -123,7 +123,7 @@ help:
 	@echo '  build        - Build binary at ./cmd/ipfs/ipfs'
 	@echo '  nofuse       - Build binary with no fuse support'
 	@echo '  install      - Build binary and install into $$GOBIN'
-	@echo '  mod_tidy     - Remove unused dependencis from go.mod files'
+	@echo '  mod_tidy     - Remove unused dependencies from go.mod files'
 #	@echo '  dist_install - TODO: c.f. ./cmd/ipfs/dist/README.md'
 	@echo ''
 	@echo 'CLEANING TARGETS:'

client/rpc/errors.go

@@ -68,11 +68,11 @@ func parseErrNotFound(msg string) (error, bool) {
 // Assume CIDs break on:
 // - Whitespaces: " \t\n\r\v\f"
 // - Semicolon: ";" this is to parse ipld.ErrNotFound wrapped in multierr
-// - Double Quotes: "\"" this is for parsing %q and %#v formating.
+// - Double Quotes: "\"" this is for parsing %q and %#v formatting.
 const cidBreakSet = " \t\n\r\v\f;\""
 
 func parseIPLDErrNotFound(msg string) (error, bool) {
-	// The patern we search for is:
+	// The pattern we search for is:
 	const ipldErrNotFoundKey = "ipld: could not find " /*CID*/
 	// We try to parse the CID, if it's invalid we give up and return a simple text error.
 	// We also accept "node" in place of the CID because that means it's an Undefined CID.

version.go

@@ -11,7 +11,7 @@ import (
 var CurrentCommit string
 
 // CurrentVersionNumber is the current application's version literal.
-const CurrentVersionNumber = "0.29.0"
+const CurrentVersionNumber = "0.30.0-dev"
 
 const ApiVersion = "/kubo/" + CurrentVersionNumber + "/" //nolint