Skip to content

Commit dea416b

Browse files
authored
docs: fix typos (#4763)
1 parent f738736 commit dea416b

File tree

13 files changed

+24
-24
lines changed

13 files changed

+24
-24
lines changed

docs/src/docs/contributing/website.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Left menu is configured in `src/config/sidebar.yml`.
2424

2525
## Articles
2626

27-
Articles are located in `src/docs/` in `*.mdx` files. [MDX](https://mdxjs.com/getting-started/gatsby) is markdown
27+
Articles are located in `src/docs/` in `*.mdx` files. [MDX](https://mdxjs.com/getting-started/gatsby) is Markdown
2828
allowing to use `React` components.
2929

3030
## Templating

docs/src/docs/contributing/workflow.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ Push your branch to your `golangci-lint` fork and open a pull request against th
4545

4646
## Pull request checks
4747

48-
First, please, accept [CLA](https://gist.github.com/jirfag/26a39fd375da84b2d5ad4296fecb0668) - [cla assistant](https://cla-assistant.io/) will make a comment on the pull request about it.
48+
First, please, accept [CLA](https://gist.github.com/jirfag/26a39fd375da84b2d5ad4296fecb0668) - [CLA assistant](https://cla-assistant.io/) will make a comment on the pull request about it.
4949

50-
Also, we run a few checks in CI by using GitHub actions, you can see them [here](https://github.com/golangci/golangci-lint/blob/master/.github/workflows/pr.yml).
50+
Also, we run a few checks in CI by using GitHub Actions, you can see them [here](https://github.com/golangci/golangci-lint/blob/master/.github/workflows/pr.yml).
5151

5252
## New releases
5353

5454
First, see [our versioning policy](/product/roadmap/#versioning-policy).
5555

5656
To make a new release create a tag `vx.y.z`. Don't forget to add zero patch version for a new minor release, e.g. `v1.99.0`.
57-
A GitHub action [workflow](https://github.com/golangci/golangci-lint/blob/master/.github/workflows/tag.yml) will start building and publishing release after that.
57+
A GitHub Action [workflow](https://github.com/golangci/golangci-lint/blob/master/.github/workflows/tag.yml) will start building and publishing release after that.
5858

5959
After making a release you need to update:
6060

61-
1. GitHub [action config](https://github.com/golangci/golangci-lint/blob/master/assets/github-action-config.json) by running:
61+
1. GitHub [Action config](https://github.com/golangci/golangci-lint/blob/master/assets/github-action-config.json) by running:
6262
```sh
6363
make assets/github-action-config.json
6464
```

docs/src/docs/plugins/go-plugins.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ An example linter can be found at [here](https://github.com/golangci/example-plu
4848
If you're looking for instructions on how to configure your own custom linter, they can be found further down.
4949

5050
1. If the project you want to lint does not have one already, copy the [.golangci.yml](https://github.com/golangci/golangci-lint/blob/master/.golangci.yml) to the root directory.
51-
2. Adjust the yaml to appropriate `linters-settings.custom` entries as so:
51+
2. Adjust the YAML to appropriate `linters-settings.custom` entries as so:
5252
```yaml title=.golangci.yml
5353
linters-settings:
5454
custom:

docs/src/docs/welcome/install.mdx

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/insta
3636
# or install it into ./bin/
3737
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s {.LatestVersion}
3838

39-
# In alpine linux (as it does not come with curl by default)
39+
# In Alpine Linux (as it does not come with curl by default)
4040
wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s {.LatestVersion}
4141

4242
golangci-lint --version
@@ -62,7 +62,7 @@ On Windows, you can run the above commands with Git Bash, which comes with [Git
6262

6363
Golangci-lint is available inside the majority of the package managers.
6464

65-
### MacOS
65+
### macOS
6666

6767
#### Brew
6868

@@ -76,19 +76,19 @@ brew install golangci-lint
7676
brew upgrade golangci-lint
7777
```
7878

79-
Note: Previously we used a [homebrew tap](https://github.com/golangci/homebrew-tap). We recommend using official formula instead of the tap, but sometimes the most recent release
80-
isn't immediately available via homebrew core due to manual updates that need to occur from homebrew core maintainers. In this case, the tap formula, which is updated automatically,
79+
Note: Previously we used a [Homebrew tap](https://github.com/golangci/homebrew-tap). We recommend using official formula instead of the tap, but sometimes the most recent release
80+
isn't immediately available via Homebrew core due to manual updates that need to occur from Homebrew core maintainers. In this case, the tap formula, which is updated automatically,
8181
can be used to install the latest version of `golangci-lint`:
8282

8383
```sh
8484
brew tap golangci/tap
8585
brew install golangci/tap/golangci-lint
8686
```
8787

88-
#### Macports
88+
#### MacPorts
8989

90-
It can also be installed through [macports](https://www.macports.org/)
91-
The macports installation mode is community driven, and not officially maintained by golangci team.
90+
It can also be installed through [MacPorts](https://www.macports.org/)
91+
The MacPorts installation mode is community driven, and not officially maintained by golangci team.
9292

9393
```sh
9494
sudo port install golangci-lint

docs/src/docs/welcome/integrations.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The following plugins support `golangci-lint`:
5050

5151
## Shell Completion
5252

53-
`golangci-lint` can generate bash, fish, powershell, and zsh completion files.
53+
`golangci-lint` can generate Bash, fish, PowerShell, and Zsh completion files.
5454

5555
### macOS
5656

pkg/commands/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ func computeBinarySalt(version string) ([]byte, error) {
674674
func computeConfigSalt(cfg *config.Config) ([]byte, error) {
675675
lintersSettingsBytes, err := yaml.Marshal(cfg.LintersSettings)
676676
if err != nil {
677-
return nil, fmt.Errorf("failed to json marshal config linter settings: %w", err)
677+
return nil, fmt.Errorf("failed to JSON marshal config linter settings: %w", err)
678678
}
679679

680680
configData := bytes.NewBufferString("linters-settings=")

pkg/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/ldez/gomoddirectives"
1010
)
1111

12-
// Config encapsulates the config data specified in the golangci-lint yaml config file.
12+
// Config encapsulates the config data specified in the golangci-lint YAML config file.
1313
type Config struct {
1414
cfgDir string // The directory containing the golangci-lint config file.
1515

pkg/golinters/gci/gci.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func diffFormattedFilesToArray(paths []string, cfg gcicfg.Config, diffs *[]strin
194194
})
195195
}
196196

197-
// Code bellow this comment is borrowed and modified from gci.
197+
// Code below this comment is borrowed and modified from gci.
198198
// https://github.com/daixiang0/gci/blob/4725b0c101801e7449530eee2ddb0c72592e3405/pkg/config/config.go
199199

200200
var defaultOrder = map[string]int{

pkg/golinters/nolintlint/internal/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# nolintlint
22

33
nolintlint is a Go static analysis tool to find ill-formed or insufficiently explained `//nolint` directives for golangci-lint
4-
(or any other linter, using this package)
4+
(or any other linter, using this package)
55

66
## Purpose
77

@@ -15,7 +15,7 @@ func hash(data []byte) []byte {
1515
}
1616
```
1717

18-
In the above case, nolint directives are present but the user has no idea why this is being done or which linter
18+
In the above case, nolint directives are present, but the user has no idea why this is being done or which linter
1919
is being suppressed (in this case, gosec recommends against use of md5). `nolintlint` can require that the code provide an explanation, which might look as follows:
2020

2121
```Go
@@ -26,6 +26,6 @@ func hash(data []byte) []byte {
2626
}
2727
```
2828

29-
`nolintlint` can also identify cases where you may have written `// nolint`. Finally `nolintlint`, can also enforce that you
29+
`nolintlint` can also identify cases where you may have written `// nolint`. Finally, `nolintlint`, can also enforce that you
3030
use the machine-readable nolint directive format `//nolint:all` and that you mention what linter is being suppressed, as shown above when we write `//nolint:gosec`.
3131

pkg/printers/githubaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type GitHubAction struct {
1414
w io.Writer
1515
}
1616

17-
// NewGitHubAction output format outputs issues according to GitHub actions.
17+
// NewGitHubAction output format outputs issues according to GitHub Action.
1818
// Deprecated
1919
func NewGitHubAction(w io.Writer) *GitHubAction {
2020
return &GitHubAction{w: w}

scripts/gen_github_action_config/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func fetchAllReleases(ctx context.Context) ([]release, error) {
225225
for {
226226
err := client.Query(ctx, &q, vars)
227227
if err != nil {
228-
return nil, fmt.Errorf("failed to fetch releases page from github: %w", err)
228+
return nil, fmt.Errorf("failed to fetch releases page from GitHub: %w", err)
229229
}
230230
releases := q.Repository.Releases
231231
allReleases = append(allReleases, releases.Nodes...)

scripts/website/expand_templates/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func processDoc(path string, replacements map[string]string, madeReplacements ma
6666
nextContent := content
6767
nextContent = strings.ReplaceAll(nextContent, fmt.Sprintf("{.%s}", key), replacement)
6868

69-
// Yaml formatter in mdx code section makes extra spaces, need to match them too.
69+
// YAML formatter in mdx code section makes extra spaces, need to match them too.
7070
nextContent = strings.ReplaceAll(nextContent, fmt.Sprintf("{ .%s }", key), replacement)
7171

7272
if nextContent != content {

test/configuration_file_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func decodeYamlFile(filename string) (any, error) {
113113
var m any
114114
err = yaml.NewDecoder(yamlFile).Decode(&m)
115115
if err != nil {
116-
return nil, fmt.Errorf("[%s] yaml decode: %w", filename, err)
116+
return nil, fmt.Errorf("[%s] YAML decode: %w", filename, err)
117117
}
118118

119119
return m, nil

0 commit comments

Comments
 (0)