From f94399cff990b44adbfa6fd16d4bb5117584b700 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 17 Nov 2016 13:22:20 +0900 Subject: [PATCH] Polish --- .../springframework/security/config/spring-security-4.2.rnc | 2 +- .../springframework/security/config/spring-security-4.2.xsd | 4 ++-- docs/manual/src/docs/asciidoc/index.adoc | 2 +- .../security/ldap/server/ApacheDSContainer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc index ee0542d112..3c7896cda2 100644 --- a/config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc +++ b/config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc @@ -547,7 +547,7 @@ concurrency-control = element concurrency-control {concurrency-control.attlist, empty} concurrency-control.attlist &= - ## The maximum number of sessions a single authenticated user can have open at the same time. Defaults to "1". A negative value denotes unlimitted sessions. + ## The maximum number of sessions a single authenticated user can have open at the same time. Defaults to "1". A negative value denotes unlimited sessions. attribute max-sessions {xsd:integer}? concurrency-control.attlist &= ## The URL a user will be redirected to if they attempt to use a session which has been "expired" because they have logged in again. diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd index 960158e19e..3ffe8f7c7e 100644 --- a/config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd +++ b/config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd @@ -1772,7 +1772,7 @@ The maximum number of sessions a single authenticated user can have open at the same time. - Defaults to "1". A negative value denotes unlimitted sessions. + Defaults to "1". A negative value denotes unlimited sessions. @@ -2822,4 +2822,4 @@ - \ No newline at end of file + diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index b385713db3..8c32759042 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -7020,7 +7020,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; // ... @PutMapping("/users/self") -public ModelAndView updateName(@AuthenticationPrincipal(expression = "@jpaEntityManager.merge(#this)") CustomUser attachedCustomUser +public ModelAndView updateName(@AuthenticationPrincipal(expression = "@jpaEntityManager.merge(#this)") CustomUser attachedCustomUser, @RequestParam String firstName) { // change the firstName on an attached instance which will be persisted to the database diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java index 57a682ea57..ca63320d37 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java +++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java @@ -50,7 +50,7 @@ import org.springframework.util.Assert; /** * Provides lifecycle services for the embedded apacheDS server defined by the supplied - * configuration. Used by {code LdapServerBeanDefinitionParser}. An instance will be + * configuration. Used by {@code LdapServerBeanDefinitionParser}. An instance will be * stored in the application context for each embedded server instance. It will start the * server when the context is initialized and shut it down when it is closed. It is * intended for temporary embedded use and will not retain changes across start/stop