Browse Source

Polish

pull/208/merge
Johnny Lim 9 years ago committed by Rob Winch
parent
commit
f94399cff9
  1. 2
      config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc
  2. 2
      config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd
  3. 2
      docs/manual/src/docs/asciidoc/index.adoc
  4. 2
      ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java

2
config/src/main/resources/org/springframework/security/config/spring-security-4.2.rnc

@ -547,7 +547,7 @@ concurrency-control = @@ -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.

2
config/src/main/resources/org/springframework/security/config/spring-security-4.2.xsd

@ -1772,7 +1772,7 @@ @@ -1772,7 +1772,7 @@
<xs:attribute name="max-sessions" type="xs:integer">
<xs:annotation>
<xs:documentation>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.
</xs:documentation>
</xs:annotation>
</xs:attribute>

2
docs/manual/src/docs/asciidoc/index.adoc

@ -7020,7 +7020,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -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

2
ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java

@ -50,7 +50,7 @@ import org.springframework.util.Assert; @@ -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

Loading…
Cancel
Save