diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c0834525..a72cda3f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,11 +50,11 @@ future pull requests as well, simply so that the Spring Framework team knows immediately that this process is complete. -## Create your branch from `master` +## Create your branch from `main` If your pull request addresses a bug or improvement, please create your branch -from Spring Web Flow's `master` branch. Rest assured that if your pull -request is accepted and merged into `master`, these changes will also +from Spring Web Flow's `main` branch. Rest assured that if your pull +request is accepted and merged into `main`, these changes will also considered as back-port candidates. diff --git a/src/reference/whatsnew.adoc b/src/reference/whatsnew.adoc index 93c7855d..c53caf2f 100644 --- a/src/reference/whatsnew.adoc +++ b/src/reference/whatsnew.adoc @@ -32,7 +32,7 @@ This release requires JDK 1.6. Spring Web Flow now supports a Java-based alternative for its system configuration. See the updated <<_system_setup>>. -See the https://github.com/spring-projects/spring-webflow-samples/tree/master/booking-mvc[booking-mvc] and https://github.com/spring-projects/spring-webflow-samples/tree/master/booking-faces[booking-faces] samples that have been updated to use all Java configuration. +See the https://github.com/spring-projects/spring-webflow-samples/tree/main/booking-mvc[booking-mvc] and https://github.com/spring-projects/spring-webflow-samples/tree/main/booking-faces[booking-faces] samples that have been updated to use all Java configuration. [[_whatsnew_swf_mvcflash]] ==== Spring MVC Flash Scope Integration