diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc
index 5e140677..3340b8f7 100644
--- a/docs/src/main/asciidoc/quickstart.adoc
+++ b/docs/src/main/asciidoc/quickstart.adoc
@@ -2,7 +2,7 @@ Start the server:
 
 ----
 $ cd spring-cloud-config-server
-$ mvn spring-boot:run
+$ ../mvnw spring-boot:run
 ----
 
 The server is a Spring Boot application so you can run it from your
diff --git a/docs/src/main/ruby/generate_readme.sh b/docs/src/main/ruby/generate_readme.sh
index 7784d1d6..6d0ce9dc 100755
--- a/docs/src/main/ruby/generate_readme.sh
+++ b/docs/src/main/ruby/generate_readme.sh
@@ -16,9 +16,16 @@ end
 
 file = ARGV[0] if ARGV.length>0
 
-srcDir = File.dirname(file)
-out = "// Do not edit this file (e.g. go instead to docs/src/main/asciidoc)\n\n"
-doc = Asciidoctor.load_file file, safe: :safe, parse: false, attributes: 'allow-uri-read'
+# Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
+doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
+header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
+header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
+attrs = doc.attributes
+attrs['allow-uri-read'] = true
+puts attrs
+
+out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n"
+doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs
 out << doc.reader.read
 
 unless options[:to_file]
diff --git a/spring-cloud-config-sample/src/main/java/sample/Application.java b/spring-cloud-config-sample/src/main/java/sample/Application.java
index f4e9a404..c00219ea 100644
--- a/spring-cloud-config-sample/src/main/java/sample/Application.java
+++ b/spring-cloud-config-sample/src/main/java/sample/Application.java
@@ -2,13 +2,9 @@
 package sample;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 public class Application {
 
 	public static void main(String[] args) {