diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4847406f9..d89461326 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,4 +14,4 @@ Please squash your code review edits & force push. Multiple commits in a PR are fine, but only if they're each logically separate and all tests pass at each stage. No fixup commits. -See [commit-messages.md](docs/commit-messages.md) (or skim `git log`) for our commit message style. +See [commit-messages.md](../docs/commit-messages.md) (or skim `git log`) for our commit message style. diff --git a/cmd/tailscale/cli/whois.go b/cmd/tailscale/cli/whois.go index 44ff68dec..d31455525 100644 --- a/cmd/tailscale/cli/whois.go +++ b/cmd/tailscale/cli/whois.go @@ -26,7 +26,7 @@ var whoisCmd = &ffcli.Command{ FlagSet: func() *flag.FlagSet { fs := newFlagSet("whois") fs.BoolVar(&whoIsArgs.json, "json", false, "output in JSON format") - fs.StringVar(&whoIsArgs.proto, "proto", "", `protocol; one of "tcp" or "udp"; empty mans both `) + fs.StringVar(&whoIsArgs.proto, "proto", "", `protocol; one of "tcp" or "udp"; empty means both`) return fs }(), } diff --git a/net/dns/manager_linux.go b/net/dns/manager_linux.go index 4304df261..f814f43fd 100644 --- a/net/dns/manager_linux.go +++ b/net/dns/manager_linux.go @@ -377,7 +377,7 @@ func resolvedIsActuallyResolver(logf logger.Logf, env newOSConfigEnv, dbg func(k func isLibnssResolveUsed(env newOSConfigEnv) error { bs, err := env.fs.ReadFile("/etc/nsswitch.conf") if err != nil { - return fmt.Errorf("reading /etc/resolv.conf: %w", err) + return fmt.Errorf("reading /etc/nsswitch.conf: %w", err) } for _, line := range strings.Split(string(bs), "\n") { fields := strings.Fields(line)