Merge branch '2.1.x'

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

@@ -615,7 +615,7 @@ then add a file named `src/main/java/Example.java` to contain the following code
 			return "Hello World!";
 		}
 
-		public static void main(String[] args) throws Exception {
+		public static void main(String[] args) {
 			SpringApplication.run(Example.class, args);
 		}
 

spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -3081,7 +3081,7 @@ following example:
 			return application.sources(Application.class);
 		}
 
-		public static void main(String[] args) throws Exception {
+		public static void main(String[] args) {
 			SpringApplication.run(Application.class, args);
 		}