Merge #1602 into 1.0.7

reactor · Apr 22, 2021 · e94503a · e94503a
2 parents 3ecd06c + 0f543f7
commit e94503a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ assignees: ''
 <!--- Provide a general summary of the issue in the title above -->
 
 <!--- /!\ Make sure to follow the Contribution Guidelines and notably for security issues:
-https://github.com/reactor/reactor-netty/blob/master/CONTRIBUTING.md
+https://github.com/reactor/reactor-netty/blob/main/CONTRIBUTING.md
 https://tanzu.vmware.com/security
 -->
 <!--- /!\ Questions should be asked on [Gitter](https://gitter.im/reactor/reactor-netty) or [StackOverflow](https://stackoverflow.com/questions/tagged/reactor-netty). -->

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -10,7 +10,7 @@ assignees: ''
 <!--- Provide a general summary of the issue in the Title above -->
 
 <!--- /!\ Make sure to follow the Contribution Guidelines and notably for security issues:
-https://github.com/reactor/reactor-netty/blob/master/CONTRIBUTING.md
+https://github.com/reactor/reactor-netty/blob/main/CONTRIBUTING.md
 https://tanzu.vmware.com/security
 -->
 <!--- /!\ Questions should be asked on [Gitter](https://gitter.im/reactor/reactor-netty) or [StackOverflow](https://stackoverflow.com/questions/tagged/reactor-netty). -->

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [0.9.x, master]
+    branches: [0.9.x, main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [0.9.x, master]
+    branches: [0.9.x, main]
   schedule:
     - cron: '0 12 * * 6'
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,7 +2,7 @@ name: publish
 on:
   push:
     branches: # For branches, better to list them explicitly than regexp include
-      - master
+      - main
       - 0.9.x
 jobs:
   # General job notes: we DON'T want to cancel any previous runs, especially in the case of a "back to snapshots" build right after a release push

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ Having trouble with `Reactor Netty`? We'd like to help!
   tagged with [`reactor-netty`](https://stackoverflow.com/questions/tagged/reactor-netty). You can also chat
   with the community on [Gitter](https://gitter.im/reactor/reactor-netty).
 * Report bugs with `Reactor Netty` at [github.com/reactor/reactor-netty/issues](https://github.com/reactor/reactor-netty/issues).
-* More about [Support and Deprecation policies](https://github.com/reactor/.github/blob/master/SUPPORT.adoc)
+* More about [Support and Deprecation policies](https://github.com/reactor/.github/blob/main/SUPPORT.adoc)
 
 ## Reporting Issues
 `Reactor Netty` uses `GitHub’s` integrated issue tracking system to record bugs and feature requests.

diff --git a/docs/asciidoc/about-doc.adoc b/docs/asciidoc/about-doc.adoc
@@ -18,7 +18,7 @@ copy contains this `Copyright Notice`, whether distributed in print or electroni
 == Contributing to the Documentation
 The reference guide is written in
 https://asciidoctor.org/docs/asciidoc-writers-guide/[Asciidoc], and you can find its
-sources at https://github.com/reactor/reactor-netty/tree/master/docs/asciidoc.
+sources at https://github.com/reactor/reactor-netty/tree/main/src/docs/asciidoc.
 
 If you have an improvement, we will be happy to get a pull request from you!
 
@@ -31,7 +31,7 @@ ifeval::["{backend}" == "html5"]
 TIP: To facilitate documentation edits, most sections have a link at the end that opens
 an edit `UI` directly on `GitHub` for the main source file for that section. These links are
 only present in the `HTML5` version of this reference guide. They look like the following link:
-link:https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/about-doc.adoc[Suggest Edit^, role="fa fa-edit"] to <<about-doc>>.
+link:https://github.com/reactor/reactor-netty/edit/main/src/docs/asciidoc/about-doc.adoc[Suggest Edit^, role="fa fa-edit"] to <<about-doc>>.
 endif::[]
 
 == Getting Help
@@ -44,5 +44,5 @@ https://stackoverflow.com/tags/reactor-netty[`reactor-netty`].
 https://github.com/reactor/reactor-netty/issues[reactor-netty].
 
 NOTE: All of `Reactor Netty` is open source,
-https://github.com/reactor/reactor-netty/tree/master/docs/asciidoc[including this
+https://github.com/reactor/reactor-netty/tree/main/src/docs/asciidoc[including this
 documentation].
diff --git a/docs/asciidoc/getting-started.adoc b/docs/asciidoc/getting-started.adoc
@@ -215,6 +215,6 @@ repositories {
 [[support]]
 == Support and policies
 
-The entries below are mirroring https://github.com/reactor/.github/blob/master/SUPPORT.adoc
+The entries below are mirroring https://github.com/reactor/.github/blob/main/SUPPORT.adoc
 
-include::https://raw.githubusercontent.com/reactor/.github/master/SUPPORT.adoc[leveloffset=3,lines=1..38]
+include::https://raw.githubusercontent.com/reactor/.github/main/SUPPORT.adoc[leveloffset=3,lines=1..38]
diff --git a/docs/asciidoc/highlight/CHANGES.md b/docs/asciidoc/highlight/CHANGES.md
@@ -699,7 +699,7 @@ We're going to redesign the old [demo/test suite][demo] into an interactive
 demo web app. If you're confident front-end developer or designer and want to
 help us with it, drop a comment into [the issue][#542] on GitHub.
 
-[test]: https://github.com/isagalaev/highlight.js/tree/master/test
+[test]: https://github.com/highlightjs/highlight.js/tree/main/test
 [demo]: https://highlightjs.org/static/test.html
 [#542]: https://github.com/isagalaev/highlight.js/issues/542
 [ci]: https://travis-ci.org/isagalaev/highlight.js

diff --git a/docs/asciidoc/highlight/README.md b/docs/asciidoc/highlight/README.md
@@ -146,5 +146,5 @@ Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
 [4]: https://highlightjs.readthedocs.io/en/latest/api.html#configure-options
 [5]: https://highlightjs.org/download/
 [6]: https://highlightjs.readthedocs.io/en/latest/building-testing.html
-[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
 [8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt
diff --git a/docs/asciidoc/highlight/README.ru.md b/docs/asciidoc/highlight/README.ru.md
@@ -138,5 +138,5 @@ Highlight.js распространяется под лицензией BSD. П
 [4]: https://highlightjs.readthedocs.io/en/latest/api.html#configure-options
 [5]: https://highlightjs.org/download/
 [6]: https://highlightjs.readthedocs.io/en/latest/building-testing.html
-[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
 [8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.ru.txt
diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -9,49 +9,49 @@ ifndef::host-github[:ext-relative: {outfilesuffix}]
 
 include::about-doc.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/about-doc.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/about-doc.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<about-doc>>"
 endif::[]
 
 include::getting-started.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/getting-started.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/getting-started.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<getting-started>>"
 endif::[]
 
 include::tcp-server.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/tcp-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/tcp-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<tcp-server>>"
 endif::[]
 
 include::tcp-client.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/tcp-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/tcp-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<tcp-client>>"
 endif::[]
 
 include::http-server.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/http-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/http-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<http-server>>"
 endif::[]
 
 include::http-client.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/http-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/http-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<http-client>>"
 endif::[]
 
 include::udp-server.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/udp-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/udp-server.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<udp-server>>"
 endif::[]
 
 include::udp-client.adoc[leveloffset=1]
 ifeval::["{backend}" == "html5"]
-https://github.com/reactor/reactor-netty/edit/master/docs/asciidoc/udp-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
+https://github.com/reactor/reactor-netty/edit/main/docs/asciidoc/udp-client.adoc[Suggest Edit^, title="Suggest an edit to the above section via github", role="fa fa-edit"]
 to "<<udp-client>>"
 endif::[]