From 14eb8a7bb147e5c3deea687ca1e54f43da743695 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 14 Jan 2021 16:02:02 +0100 Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/2.2.x' # Conflicts: # docs/src/main/asciidoc/_configprops.adoc --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 910d074f..650c26c7 100644 --- a/README.adoc +++ b/README.adoc @@ -319,4 +319,4 @@ IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply chec == License -The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/2.2.x/LICENSE.txt[here]. +The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here]. diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 53c91e69..90482162 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -22,4 +22,4 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste == License -The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/2.2.x/LICENSE.txt[here]. +The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/master/LICENSE.txt[here]. From 286360cf7b8351c94eb1776f608f5d1c32de7423 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 18 Jan 2021 11:11:32 +0100 Subject: [PATCH 2/2] Add information on contributing, community support and commercial support to project site (#458) * Add information on contributing, community support and commercial support to project site. * Fixes after review. --- docs/src/main/asciidoc/sagan-index.adoc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc index b58ff33c..0f960483 100644 --- a/docs/src/main/asciidoc/sagan-index.adoc +++ b/docs/src/main/asciidoc/sagan-index.adoc @@ -24,3 +24,18 @@ public class WebApplication { } ``` + +## Contributing + +We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-openfeign/blob/master/README.adoc#3-contributing[here]. + +## Community Support + +* You can report issues through https://github.com/spring-cloud/spring-cloud-openfeign/issues[Github]. +* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-feign` tag. +* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter]. + +## Commercial Support + +Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering. +