From e05363f9b055bacbcaf916ccc632ede6abfa77e4 Mon Sep 17 00:00:00 2001 From: "Stern, Ittay (is9613)" Date: Tue, 31 May 2022 16:09:56 +0300 Subject: [PATCH] Restore Custom Favicon section in the reference guide The section about favicon was mistakenly removed in 5fceb9d and this commit reinstates it. See gh-31224 --- .../src/docs/asciidoc/anchor-rewrite.properties | 1 + .../spring-boot-docs/src/docs/asciidoc/web/servlet.adoc | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties index e3dfb57564..064556e017 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties @@ -773,6 +773,7 @@ features.developing-web-applications.spring-mvc.json=web.servlet.spring-mvc.json features.developing-web-applications.spring-mvc.message-codes=web.servlet.spring-mvc.message-codes features.developing-web-applications.spring-mvc.static-content=web.servlet.spring-mvc.static-content features.developing-web-applications.spring-mvc.welcome-page=web.servlet.spring-mvc.welcome-page +features.developing-web-applications.spring-mvc.favicon=web.servlet.spring-mvc.favicon features.developing-web-applications.spring-mvc.content-negotiation=web.servlet.spring-mvc.content-negotiation features.developing-web-applications.spring-mvc.binding-initializer=web.servlet.spring-mvc.binding-initializer features.developing-web-applications.spring-mvc.template-engines=web.servlet.spring-mvc.template-engines diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc index 55df95d1fe..02c6139afd 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc @@ -216,6 +216,13 @@ If either is found, it is automatically used as the welcome page of the applicat +[[web.servlet.spring-mvc.favicon]] +==== Custom Favicon +As with other static resources, Spring Boot checks for a `favicon.ico` in the configured static content locations. +If such a file is present, it is automatically used as the favicon of the application. + + + [[web.servlet.spring-mvc.content-negotiation]] ==== Path Matching and Content Negotiation Spring MVC can map incoming HTTP requests to handlers by looking at the request path and matching it to the mappings defined in your application (for example, `@GetMapping` annotations on Controller methods).