From 90181f34c0c03f0c0de6694dc6a9f6946fe9db75 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Fri, 20 Mar 2020 20:05:09 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/2.2.x'

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml
---
 docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc
index ccc0e562..7f7143c4 100644
--- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc
@@ -517,7 +517,7 @@ public interface DemoTemplate {
 }
 ----
 
-=== Spring MatrixVariable Support
+=== Spring @MatrixVariable Support
 
 Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation.