From 668018c715f3ee840e2593fe678a90e021f13c42 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 29 Sep 2014 12:09:19 +0100
Subject: [PATCH] Move adoc to asciidoc

---
 Guardfile                                        |  4 ++--
 src/main/adoc/intro.adoc                         | 16 ----------------
 src/main/{adoc => asciidoc}/README.adoc          |  0
 src/main/asciidoc/intro.adoc                     |  2 ++
 src/main/{adoc => asciidoc}/quickstart.adoc      |  0
 .../{adoc => asciidoc}/spring-cloud-config.adoc  |  0
 6 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/adoc/intro.adoc
 rename src/main/{adoc => asciidoc}/README.adoc (100%)
 create mode 100644 src/main/asciidoc/intro.adoc
 rename src/main/{adoc => asciidoc}/quickstart.adoc (100%)
 rename src/main/{adoc => asciidoc}/spring-cloud-config.adoc (100%)

diff --git a/Guardfile b/Guardfile
index 33024ef9..1a4e1279 100644
--- a/Guardfile
+++ b/Guardfile
@@ -5,7 +5,7 @@ options = {:mkdirs => true, :safe => :unsafe, :attributes => 'linkcss'}
 
 guard 'shell' do
   watch(/^[A-Za-z].*\.adoc$/) {|m|
-    Asciidoctor.render_file('src/main/adoc/README.adoc', options.merge(:to_file => './README.md'))
-    Asciidoctor.render_file('src/main/adoc/spring-cloud-config.adoc', options.merge(:to_dir => 'target/docs'))
+    Asciidoctor.render_file('src/main/asciidoc/README.adoc', options.merge(:to_file => './README.md'))
+    Asciidoctor.render_file('src/main/asciidoc/spring-cloud-config.adoc', options.merge(:to_dir => 'target/generated-docs'))
   }
 end
diff --git a/src/main/adoc/intro.adoc b/src/main/adoc/intro.adoc
deleted file mode 100644
index f04ccd41..00000000
--- a/src/main/adoc/intro.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-Spring Cloud Config provides server and client-side support for
-externalized configuration in a distributed system. With the Config
-Server you have a central place to manage external properties for
-applications across all environments. The concepts on both client and
-server map identically to the Spring `Environment` and
-`PropertySource` abstractions, so they fit very well with Spring
-applications, but can be used with any application running in any
-language. As an application moves through the deployment pipeline from
-dev to test and into production you can manage the configuration
-between those environments and be certain that applications have
-everything they need to run when they migrate. The default
-implementation of the server storage backend uses git so it easily
-supports labelled versions of configuration environments, as well as
-being accessible to a wide range of tooling for managing the content.
-It is easy to add alternative implementations and plug them in with
-Spring configuration.
diff --git a/src/main/adoc/README.adoc b/src/main/asciidoc/README.adoc
similarity index 100%
rename from src/main/adoc/README.adoc
rename to src/main/asciidoc/README.adoc
diff --git a/src/main/asciidoc/intro.adoc b/src/main/asciidoc/intro.adoc
new file mode 100644
index 00000000..e47aae85
--- /dev/null
+++ b/src/main/asciidoc/intro.adoc
@@ -0,0 +1,2 @@
+Spring Cloud Config provides server and client-side support for externalized configuration in a distributed system. With the Config Server you have a central place to manage external properties for applications across all environments. The concepts on both client and server map identically to the Spring `Environment` and `PropertySource` abstractions, so they fit very well with Spring applications, but can be used with any application running in any language. As an application moves through the deployment pipeline from dev to test and into production you can manage the configuration between those environments and be certain that applications have everything they need to run when they migrate. The default implementation of the server storage backend uses git so it easily supports labelled versions of configuration environments, as well as being accessible to a wide range of tooling for managing the content.  It is easy to add alternative implementations and plug them in with Spring configuration.
+
diff --git a/src/main/adoc/quickstart.adoc b/src/main/asciidoc/quickstart.adoc
similarity index 100%
rename from src/main/adoc/quickstart.adoc
rename to src/main/asciidoc/quickstart.adoc
diff --git a/src/main/adoc/spring-cloud-config.adoc b/src/main/asciidoc/spring-cloud-config.adoc
similarity index 100%
rename from src/main/adoc/spring-cloud-config.adoc
rename to src/main/asciidoc/spring-cloud-config.adoc