Merge branch '5.3.x'

# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
This commit is contained in:
Sam Brannen
2022-09-14 16:52:55 +02:00
17 changed files with 22 additions and 22 deletions

View File

@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* Convenient super class for many html tags that render content using the databinding
* Convenient superclass for many html tags that render content using the databinding
* features of the {@link AbstractHtmlElementTag AbstractHtmlElementTag}. The only thing
* sub-tags need to do is override {@link #renderDefaultContent(TagWriter)}.
*