Skip to content

Commit 3f1af9b

Browse files
committed
Merge pull request #31224 from ittays
* pr/31224: Restore Custom Favicon section in the reference guide Closes gh-31224
2 parents 09978b3 + e05363f commit 3f1af9b

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@ features.developing-web-applications.spring-mvc.json=web.servlet.spring-mvc.json
773773
features.developing-web-applications.spring-mvc.message-codes=web.servlet.spring-mvc.message-codes
774774
features.developing-web-applications.spring-mvc.static-content=web.servlet.spring-mvc.static-content
775775
features.developing-web-applications.spring-mvc.welcome-page=web.servlet.spring-mvc.welcome-page
776+
features.developing-web-applications.spring-mvc.favicon=web.servlet.spring-mvc.favicon
776777
features.developing-web-applications.spring-mvc.content-negotiation=web.servlet.spring-mvc.content-negotiation
777778
features.developing-web-applications.spring-mvc.binding-initializer=web.servlet.spring-mvc.binding-initializer
778779
features.developing-web-applications.spring-mvc.template-engines=web.servlet.spring-mvc.template-engines

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ If either is found, it is automatically used as the welcome page of the applicat
216216

217217

218218

219+
[[web.servlet.spring-mvc.favicon]]
220+
==== Custom Favicon
221+
As with other static resources, Spring Boot checks for a `favicon.ico` in the configured static content locations.
222+
If such a file is present, it is automatically used as the favicon of the application.
223+
224+
225+
219226
[[web.servlet.spring-mvc.content-negotiation]]
220227
==== Path Matching and Content Negotiation
221228
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).

0 commit comments

Comments
 (0)