From 7165810d2a13721e9877769c77f36997ed487985 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Mon, 17 May 2021 20:36:09 +0200
Subject: [PATCH 1/4] doc: TOC level 3

---
 .../gatsby-theme-docs/src/components/Docs/TOC/index.js   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/src/@rocketseat/gatsby-theme-docs/src/components/Docs/TOC/index.js b/docs/src/@rocketseat/gatsby-theme-docs/src/components/Docs/TOC/index.js
index 53946b34fa11..e0e21d8314cf 100644
--- a/docs/src/@rocketseat/gatsby-theme-docs/src/components/Docs/TOC/index.js
+++ b/docs/src/@rocketseat/gatsby-theme-docs/src/components/Docs/TOC/index.js
@@ -13,9 +13,14 @@ export default function TableOfContents({ headings }) {
         <nav>
           <ul>
             {headings
-              .filter(heading => heading.depth === 2)
+              .filter((heading) => heading.depth === 2 || heading.depth === 3)
               .map(heading => (
-                <li key={heading.value}>
+                <li
+                  key={heading.value}
+                  style={{
+                    marginLeft: heading.depth === 3 ? `8px` : null,
+                  }}
+                >
                   <a href={`#${slug(heading.value)}`}>{heading.value}</a>
                 </li>
               ))}

From 610a98f4e0112cb241e854e661fb5fd66fe70655 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Mon, 17 May 2021 20:38:23 +0200
Subject: [PATCH 2/4] docs: generate a dedicated linters page.

---
 docs/src/docs/usage/configuration.mdx    |  7 ---
 docs/src/docs/usage/linters.mdx          |  4 ++
 go.mod                                   |  1 +
 scripts/expand_website_templates/main.go | 66 ++++++++++++++++++++++--
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/docs/src/docs/usage/configuration.mdx b/docs/src/docs/usage/configuration.mdx
index 00f17f504a14..ae0d87955bda 100644
--- a/docs/src/docs/usage/configuration.mdx
+++ b/docs/src/docs/usage/configuration.mdx
@@ -48,13 +48,6 @@ config file with all supported options, their description and default value:
 { .GolangciYamlExample }
 ```
 
-It's a [.golangci.yml](https://github.com/golangci/golangci-lint/blob/master/.golangci.yml) config file of this repo: we enable more linters
-than the default and have more strict settings:
-
-```yaml
-{ .GolangciYaml }
-```
-
 ## Cache
 
 GolangCI-Lint stores its cache in the [default user cache directory](https://golang.org/pkg/os/#UserCacheDir).
diff --git a/docs/src/docs/usage/linters.mdx b/docs/src/docs/usage/linters.mdx
index 5908347b9f22..ff7da95c4db1 100644
--- a/docs/src/docs/usage/linters.mdx
+++ b/docs/src/docs/usage/linters.mdx
@@ -15,3 +15,7 @@ golangci-lint help linters
 ## Disabled By Default Linters (`-E/--enable`)
 
 {.DisabledByDefaultLinters}
+
+## Linters Configuration
+
+{ .LintersExample }
diff --git a/go.mod b/go.mod
index 6aacfd630b2e..29b9c0472f51 100644
--- a/go.mod
+++ b/go.mod
@@ -84,6 +84,7 @@ require (
 	github.com/yeya24/promlinter v0.1.0
 	golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 	honnef.co/go/tools v0.1.4
 	mvdan.cc/gofumpt v0.1.1
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
diff --git a/scripts/expand_website_templates/main.go b/scripts/expand_website_templates/main.go
index e49fd6624ce5..2a54e890e97c 100644
--- a/scripts/expand_website_templates/main.go
+++ b/scripts/expand_website_templates/main.go
@@ -16,6 +16,8 @@ import (
 	"sort"
 	"strings"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/golangci/golangci-lint/internal/renameio"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
@@ -158,12 +160,12 @@ func getLatestVersion() (string, error) {
 }
 
 func buildTemplateContext() (map[string]string, error) {
-	golangciYaml, err := ioutil.ReadFile(".golangci.yml")
+	golangciYamlExample, err := ioutil.ReadFile(".golangci.example.yml")
 	if err != nil {
-		return nil, fmt.Errorf("can't read .golangci.yml: %s", err)
+		return nil, fmt.Errorf("can't read .golangci.example.yml: %s", err)
 	}
 
-	golangciYamlExample, err := ioutil.ReadFile(".golangci.example.yml")
+	lintersCfg, err := getLintersConfiguration(golangciYamlExample)
 	if err != nil {
 		return nil, fmt.Errorf("can't read .golangci.example.yml: %s", err)
 	}
@@ -200,7 +202,7 @@ func buildTemplateContext() (map[string]string, error) {
 	}
 
 	return map[string]string{
-		"GolangciYaml":                     strings.TrimSpace(string(golangciYaml)),
+		"LintersExample":                   lintersCfg,
 		"GolangciYamlExample":              strings.TrimSpace(string(golangciYamlExample)),
 		"LintersCommandOutputEnabledOnly":  string(lintersOutParts[0]),
 		"LintersCommandOutputDisabledOnly": string(lintersOutParts[1]),
@@ -314,3 +316,59 @@ func getThanksList() string {
 
 	return strings.Join(lines, "\n")
 }
+
+func getLintersConfiguration(example []byte) (string, error) {
+	builder := &strings.Builder{}
+
+	var data yaml.Node
+	err := yaml.Unmarshal(example, &data)
+	if err != nil {
+		return "", err
+	}
+
+	root := data.Content[0]
+
+	for j, node := range root.Content {
+		if node.Value != "linters-settings" {
+			continue
+		}
+
+		nodes := root.Content[j+1]
+
+		for i := 0; i < len(nodes.Content); i += 2 {
+			r := &yaml.Node{
+				Kind:  nodes.Kind,
+				Style: nodes.Style,
+				Tag:   nodes.Tag,
+				Value: node.Value,
+				Content: []*yaml.Node{
+					{
+						Kind:  root.Content[j].Kind,
+						Value: root.Content[j].Value,
+					},
+					{
+						Kind:    nodes.Kind,
+						Content: []*yaml.Node{nodes.Content[i], nodes.Content[i+1]},
+					},
+				},
+			}
+
+			_, _ = fmt.Fprintf(builder, "### %s\n\n", nodes.Content[i].Value)
+			_, _ = fmt.Fprintln(builder, "```yaml")
+
+			const ident = 2
+			encoder := yaml.NewEncoder(builder)
+			encoder.SetIndent(ident)
+
+			err = encoder.Encode(r)
+			if err != nil {
+				return "", err
+			}
+
+			_, _ = fmt.Fprintln(builder, "```")
+			_, _ = fmt.Fprintln(builder)
+		}
+	}
+
+	return builder.String(), nil
+}

From 99893f2d8fc3cbccae42f22e580ff623a30689c1 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Mon, 17 May 2021 21:34:51 +0200
Subject: [PATCH 3/4] docs: fix changelog heading

---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6297a2ba7678..48aa42597235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Follow the news and releases on our [twitter](https://twitter.com/golangci) and our [blog](https://medium.com/golangci).
 There is the most valuable changes log:
 
-## May 2021
+### May 2021
 
 1. new linters:
    * `tagliatelle`: https://github.com/ldez/tagliatelle
@@ -25,7 +25,7 @@ There is the most valuable changes log:
    * set the minimum Go version to go1.15
    * non-zero exit code when a linter produces a panic
 
-## April 2021
+### April 2021
 
 1. new linters:
    * `tagliatelle`: https://github.com/ldez/tagliatelle
@@ -46,7 +46,7 @@ There is the most valuable changes log:
 4. Misc:
    * fix: comma in exclude pattern leads to unexpected results
 
-## March 2021
+### March 2021
 
 1. new linters:
    * `gomoddirectives`: https://github.com/ldez/gomoddirectives
@@ -76,7 +76,7 @@ There is the most valuable changes log:
    * fix linters load mode
    * Restore fast linters meaning
 
-## February 2021
+### February 2021
 
 1. new linters:
    * `durationcheck`: https://github.com/charithe/durationcheck
@@ -124,7 +124,7 @@ There is the most valuable changes log:
    * update deprecated hyperlink for Sublime Text plugin
    * add docs on using homebrew tap
 
-## January 2021
+### January 2021
 
 1. new linters:
    * `predeclared`: https://github.com/nishanths/predeclared
@@ -144,7 +144,7 @@ There is the most valuable changes log:
 4. documentation:
    * bump documentation dependencies
 
-## December 2020
+### December 2020
 
 1. new linters:
    * `forbidigo`: https://github.com/ashanbrown/forbidigo

From bb658cb92f4914583f337b728bd2aee32da25d32 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Mon, 17 May 2021 23:38:22 +0200
Subject: [PATCH 4/4] chore: use only one version of gopkg.in/yaml

---
 go.mod                               | 3 +--
 go.sum                               | 3 ++-
 test/fix_test.go                     | 2 +-
 test/linters_test.go                 | 2 +-
 test/testdata/configs/gomodguard.yml | 2 +-
 test/testdata/gomodguard.go          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 29b9c0472f51..a1074b61027f 100644
--- a/go.mod
+++ b/go.mod
@@ -83,8 +83,7 @@ require (
 	github.com/valyala/quicktemplate v1.6.3
 	github.com/yeya24/promlinter v0.1.0
 	golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4
-	gopkg.in/yaml.v2 v2.4.0
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	honnef.co/go/tools v0.1.4
 	mvdan.cc/gofumpt v0.1.1
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
diff --git a/go.sum b/go.sum
index 88807cd56c5d..944fef1fe49d 100644
--- a/go.sum
+++ b/go.sum
@@ -1041,8 +1041,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/test/fix_test.go b/test/fix_test.go
index 10984496d5a3..97cde38834b0 100644
--- a/test/fix_test.go
+++ b/test/fix_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/test/testshared"
 )
diff --git a/test/linters_test.go b/test/linters_test.go
index eff1de32f281..93fa1eac0658 100644
--- a/test/linters_test.go
+++ b/test/linters_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/test/testshared"
diff --git a/test/testdata/configs/gomodguard.yml b/test/testdata/configs/gomodguard.yml
index 8f526c2819c1..ca21af62599b 100644
--- a/test/testdata/configs/gomodguard.yml
+++ b/test/testdata/configs/gomodguard.yml
@@ -5,7 +5,7 @@ linters-settings:
         - golang.org/x/mod/modfile
     blocked:
       modules:                                                      # List of blocked modules
-        - gopkg.in/yaml.v2:                                         # Blocked module
+        - gopkg.in/yaml.v3:                                         # Blocked module
             recommendations:                                        # Recommended modules that should be used instead (Optional)
               - github.com/kylelemons/go-gypsy                           
             reason: "This is an example of recommendations."        # Reason why the recommended module should be used (Optional)
diff --git a/test/testdata/gomodguard.go b/test/testdata/gomodguard.go
index cbde5f4919f5..45a47cd81f5e 100644
--- a/test/testdata/gomodguard.go
+++ b/test/testdata/gomodguard.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"golang.org/x/mod/modfile"
-	"gopkg.in/yaml.v2" // ERROR "import of package `gopkg.in/yaml.v2` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
+	"gopkg.in/yaml.v3" // ERROR "import of package `gopkg.in/yaml.v3` is blocked because the module is in the blocked modules list. `github.com/kylelemons/go-gypsy` is a recommended module. This is an example of recommendations."
 )
 
 // Something just some struct