Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #8548

Merged
merged 1 commit into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/assets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func testOneFile(f string, t *testing.T) {
}

if !bytes.Equal(vcsData, embdData) {
t.Errorf("asset %s: vcs and embedded data isnt equal", f)
t.Errorf("asset %s: vcs and embedded data isn't equal", f)
return
}

Expand Down
4 changes: 2 additions & 2 deletions core/commands/dht_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ func TestKeyTranslation(t *testing.T) {
}

if pkk != pkname {
t.Fatal("keys didnt match!")
t.Fatal("keys didn't match!")
}

if ipnsk != ipnsname {
t.Fatal("keys didnt match!")
t.Fatal("keys didn't match!")
}
}
2 changes: 1 addition & 1 deletion core/corehttp/hostname.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func prepareKnownGateways(publicGateways map[string]*config.GatewaySpec) gateway
}

// isKnownHostname checks Gateway.PublicGateways and returns matching
// GatewaySpec with gracefull fallback to version without port
// GatewaySpec with graceful fallback to version without port
func isKnownHostname(hostname string, knownGateways gatewayHosts) (gw *config.GatewaySpec, ok bool) {
// Try hostname (host+optional port - value from Host header as-is)
if gw, ok := knownGateways.exact[hostname]; ok {
Expand Down
4 changes: 2 additions & 2 deletions core/node/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func DNSResolver(cfg *config.Config) (*madns.Resolver, error) {
var opts []madns.Option
var err error

domains := make(map[string]struct{}) // to track overriden default resolvers
domains := make(map[string]struct{}) // to track overridden default resolvers
rslvrs := make(map[string]madns.BasicResolver) // to reuse resolvers for the same URL

for domain, url := range cfg.DNS.Resolvers {
Expand Down Expand Up @@ -58,7 +58,7 @@ func DNSResolver(cfg *config.Config) (*madns.Resolver, error) {
}
}

// fill in defaults if not overriden by the user
// fill in defaults if not overridden by the user
for domain, url := range defaultResolvers {
_, ok := domains[domain]
if ok {
Expand Down
2 changes: 1 addition & 1 deletion docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@ Example:

Be mindful that:
- Currently only `https://` URLs for [DNS over HTTPS (DoH)](https://en.wikipedia.org/wiki/DNS_over_HTTPS) endpoints are supported as values.
- The default catch-all resolver is the cleartext one provided by your operating system. It can be overriden by adding a DoH entry for the DNS root indicated by `.` as illustrated above.
- The default catch-all resolver is the cleartext one provided by your operating system. It can be overridden by adding a DoH entry for the DNS root indicated by `.` as illustrated above.
- Out-of-the-box support for selected decentralized TLDs relies on a [centralized service which is provided on best-effort basis](https://www.cloudflare.com/distributed-web-gateway-terms/). The implicit DoH resolvers are:
```json
{
Expand Down
8 changes: 4 additions & 4 deletions docs/snap.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Publishing go-ipfs as a snap

> Snap is the default package manager for ubuntu since the release of 20.04. This doc captures what we know about building go-ipfs as a snap packge and publishing it to the snapstore.
> Snap is the default package manager for ubuntu since the release of 20.04. This doc captures what we know about building go-ipfs as a snap package and publishing it to the snapstore.

The go-ipfs snap is defined in [snap/snapcraft.yaml](https://github.com/ipfs/go-ipfs/blob/master/snap/snapcraft.yaml). For more detail on our snapcraft.yaml see: https://github.com/ipfs-shipyard/ipfs-snap

Expand All @@ -15,7 +15,7 @@ Linux user can install go-ipfs with:
$ snap install ipfs
```

Apps installed via Snapcraft are auto-updating by default. Snapcraft uses 'Release Channels' to let the user pick their stability level, with channels for `stable`, `candidate`, `beta` and `edge`. Snap will install the lasest release from the `stable` channel by default. A user that wants to test out the bleeding edge can opt in by passing the `--edge` flag
Apps installed via Snapcraft are auto-updating by default. Snapcraft uses 'Release Channels' to let the user pick their stability level, with channels for `stable`, `candidate`, `beta` and `edge`. Snap will install the latest release from the `stable` channel by default. A user that wants to test out the bleeding edge can opt in by passing the `--edge` flag

```
$ snap install --edge ipfs
Expand Down Expand Up @@ -182,10 +182,10 @@ The `ipfs` snapcraft.io listing can be edited by
- @lidel
- @olizilla

You need a Canonical developer account, then ask an existing owner to add you. Accsess is managed here https://dashboard.snapcraft.io/snaps/ipfs/collaboration/
You need a Canonical developer account, then ask an existing owner to add you. Access is managed here https://dashboard.snapcraft.io/snaps/ipfs/collaboration/


The launchpad.net config is managed by [**IPFS Maintainers**](https://launchpad.net/~ipfs) team, and you can request to join that team with your Canonical developer acccount. The list of maintainers is here: https://launchpad.net/~ipfs/+members
The launchpad.net config is managed by [**IPFS Maintainers**](https://launchpad.net/~ipfs) team, and you can request to join that team with your Canonical developer account. The list of maintainers is here: https://launchpad.net/~ipfs/+members

At the time of writing the launchpad maintainers are:

Expand Down
4 changes: 2 additions & 2 deletions misc/systemd/ipfs-hardened.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file will be overwritten on package upgrades, avoid customizations here.
#
# To make persistant changes, create file in
# To make persistent changes, create file in
# "/etc/systemd/system/ipfs.service.d/overwrite.conf" with
# `systemctl edit ipfs.service`. This file will be parsed after this
# file has been parsed.
Expand All @@ -13,7 +13,7 @@
# For more info about custom unit files see systemd.unit(5).

# This service file enables systemd-hardening features compatible with IPFS,
# while breaking compability with the fuse-mount function. Use this one only
# while breaking compatibility with the fuse-mount function. Use this one only
# if you don't need the fuse-mount functionality.

[Unit]
Expand Down
2 changes: 1 addition & 1 deletion misc/systemd/ipfs.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file will be overwritten on package upgrades, avoid customizations here.
#
# To make persistant changes, create file in
# To make persistent changes, create file in
# "/etc/systemd/system/ipfs.service.d/overwrite.conf" with
# `systemctl edit ipfs.service`. This file will be parsed after this
# file has been parsed.
Expand Down
2 changes: 1 addition & 1 deletion plugin/plugins/peerlog/peerlog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestExtractEnabled(t *testing.T) {
expected: false,
},
{
name: "returns the vlaue of the Enabled field",
name: "returns the value of the Enabled field",
config: map[string]interface{}{"Enabled": true},
expected: true,
},
Expand Down
2 changes: 1 addition & 1 deletion repo/fsrepo/migrations/fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

const (
// Current dirstibution to fetch migrations from
// Current distribution to fetch migrations from
CurrentIpfsDist = "/ipfs/QmP7tLxzhLU1KauTRX3jkVkF93pCv4skcceyUYMhf4AKJR" // fs-repo-migrations v2.0.2
// Latest distribution path. Default for fetchers.
LatestIpfsDist = "/ipns/dist.ipfs.io"
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0101-iptb-name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test_expect_success "set up an iptb cluster" '

startup_cluster $num_nodes

test_expect_success "add an obect on one node" '
test_expect_success "add an object on one node" '
echo "ipns is super fun" > file &&
HASH_FILE=$(ipfsi 1 add -q file)
'
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0181-private-network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test_expect_success "daemon won't start with force pnet env but with no key" '

unset LIBP2P_FORCE_PNET

test_expect_success "daemon output incudes info about the reason" '
test_expect_success "daemon output includes info about the reason" '
grep "private network was not configured but is enforced by the environment" stdout ||
test_fsh cat stdout
'
Expand Down
10 changes: 5 additions & 5 deletions test/sharness/t0250-files-api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ test_files_api() {
test_cmp dirhash afterdirhash
'

test_expect_success "cannot write to nonexistant path $EXTRA" '
test_expect_success "cannot write to nonexistent path $EXTRA" '
test_expect_code 1 ipfs files write $ARGS $RAW_LEAVES /cats/bar/ < output
'

Expand Down Expand Up @@ -742,12 +742,12 @@ test_files_api() {
verify_dir_contents /
'

test_expect_success "remove nonexistant path forcibly" '
ipfs files rm --force /nonexistant
test_expect_success "remove nonexistent path forcibly" '
ipfs files rm --force /nonexistent
'

test_expect_success "remove deeply nonexistant path forcibly" '
ipfs files rm --force /deeply/nonexistant
test_expect_success "remove deeply nonexistent path forcibly" '
ipfs files rm --force /deeply/nonexistent
'

# This one should return code 1 but still remove the rest of the valid files.
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0270-filestore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ assert_repo_size_less_than() {

test_expect_success "check repo size" '
test "$(get_repo_size)" -lt "$expval" ||
{ echo should be bellow "$expval" && test_fsh get_repo_size; }
{ echo should be below "$expval" && test_fsh get_repo_size; }
'
}

Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0272-urlstore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ EOF
ipfs repo gc > /dev/null
'

test_expect_success "gatway no longer has files" '
test_expect_success "gateway no longer has files" '
test_must_fail curl -f http://127.0.0.1:$GWAY_PORT/ipfs/$HASH1a -o file1.actual
test_must_fail curl -f http://127.0.0.1:$GWAY_PORT/ipfs/$HASH2a -o file2.actual
'
Expand Down