Merge branch '1.1.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java

@@ -21,6 +21,8 @@ import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 
 /**
+ * Tests for {@link SpringBootWebSecurityConfiguration}.
+ *
  * @author Dave Syer
  */
 public class SpringBootWebSecurityConfigurationTests {