From e3e8a3eb402b406a2e38458846547511c9bde42c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 28 May 2014 00:17:03 +0200 Subject: [PATCH] Fix grammar in Javadoc for Propagation --- .../transaction/annotation/Propagation.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java index 707207574e..e28b997e7a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java @@ -56,10 +56,10 @@ public enum Propagation { MANDATORY(TransactionDefinition.PROPAGATION_MANDATORY), /** - * Create a new transaction, suspend the current transaction if one exists. - * Analogous to EJB transaction attribute of the same name. - *

Note: Actual transaction suspension will not work on out-of-the-box - * on all transaction managers. This in particular applies to JtaTransactionManager, + * Create a new transaction, and suspend the current transaction if one exists. + * Analogous to the EJB transaction attribute of the same name. + *

Note: Actual transaction suspension will not work out-of-the-box on + * all transaction managers. This in particular applies to JtaTransactionManager, * which requires the {@code javax.transaction.TransactionManager} to be * made available it to it (which is server-specific in standard J2EE). * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager