diff --git a/config/downloads.html b/config/downloads.html
new file mode 100644
index 0000000..7aa3e62
--- /dev/null
+++ b/config/downloads.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <title>Geronimo Config Downloads</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <meta name="keywords" content="">
+    <meta name="generator" content="JBake">
+
+    <!-- Le styles -->
+    <link href="../css/bootstrap.min.css" rel="stylesheet">
+    <link href="../css/asciidoctor.css" rel="stylesheet">
+    <link href="../css/base.css" rel="stylesheet">
+    <link href="../css/prettify.css" rel="stylesheet">
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="../js/html5shiv.min.js"></script>
+    <![endif]-->
+
+    <!-- Fav and touch icons -->
+    <!--<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">-->
+    <link rel="shortcut icon" href="../favicon.ico">
+  </head>
+  <body onload="prettyPrint()">
+    <div id="wrap">
+
+	<!-- Fixed navbar -->
+    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="http://geronimo.apache.org/new-site/">Apache Geronimo</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li><a href="http://geronimo.apache.org/new-site/index.html">Home</a></li>
+            <li><a href="http://geronimo.apache.org/new-site/about.html">About</a></li>
+            <li><a href="http://geronimo.apache.org/new-site/contact.html">Contact</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Projects <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                  <li><a href="http://geronimo.apache.org/new-site/config">Config</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/safeguard">Safeguard</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/specs">Specs</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/xbean">XBean</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+    <div class="container">	
+	<div class="page-header">
+		<h1>Geronimo Config Downloads</h1>
+	</div>
+
+	<p><em>19 September 2017</em></p>
+
+	<p><div class="paragraph">
+<p>|<a href="http://www.apache.org/dyn/closer.cgi/geronimo/config/geronimo-config-1.0-source-release.zip">geronimo-config-1.0-source-release</a>
+|<a href="http://www.apache.org/dist/geronimo/config/geronimo-config-1.0-source-release.zip.asc">ASC</a>
+|<a href="http://www.apache.org/dist/geronimo/config/geronimo-config-1.0-source-release.zip.sha1">SHA1</a>
+|<a href="http://www.apache.org/dist/geronimo/config/geronimo-config-1.0-source-release.zip.md5">MD5</a></p>
+</div>
+<table class="tableblock frame-all grid-all spread">
+</table></p>
+
+	<hr />
+
+		</div>
+		<div id="push"></div>
+    </div>
+    
+    <div id="footer">
+      <div class="container">
+        <p class="muted credit">&copy; 2014 | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a> | Baked with <a href="http://jbake.org">JBake v2.5.1</a></p>
+      </div>
+    </div>
+    
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="../js/jquery-1.11.1.min.js"></script>
+    <script src="../js/bootstrap.min.js"></script>
+    <script src="../js/prettify.js"></script>
+    
+  </body>
+</html>
\ No newline at end of file
diff --git a/config/index.html b/config/index.html
index df3d4b9..76120d1 100644
--- a/config/index.html
+++ b/config/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
-    <title>Config</title>
+    <title>Geronimo Config</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -62,20 +62,23 @@
     </div>
     <div class="container">	
 	<div class="page-header">
-		<h1>Config</h1>
+		<h1>Geronimo Config</h1>
 	</div>
 
-	<p><em>24 September 2013</em></p>
+	<p><em>19 September 2017</em></p>
 
 	<p><div class="paragraph">
-<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
-Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
-mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
-ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
-ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
-id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
-consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
-libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.</p>
+<p>Geronimo Config is an implementation of <a href="http://microprofile.io/project/eclipse/microprofile-config">MicroProfile Config</a> for use in both Java SE and Java EE applications.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Get started with our <a href="userguide.html">User Guide</a> and how to use Geronimo Config in your projects</p>
+</li>
+<li>
+<p>More information about <a href="downloads.html">Source Downloads</a></p>
+</li>
+</ul>
 </div></p>
 
 	<hr />
diff --git a/config/userguide.html b/config/userguide.html
new file mode 100644
index 0000000..303c7b9
--- /dev/null
+++ b/config/userguide.html
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <title>Geronimo Config User Guide</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <meta name="keywords" content="">
+    <meta name="generator" content="JBake">
+
+    <!-- Le styles -->
+    <link href="../css/bootstrap.min.css" rel="stylesheet">
+    <link href="../css/asciidoctor.css" rel="stylesheet">
+    <link href="../css/base.css" rel="stylesheet">
+    <link href="../css/prettify.css" rel="stylesheet">
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="../js/html5shiv.min.js"></script>
+    <![endif]-->
+
+    <!-- Fav and touch icons -->
+    <!--<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">-->
+    <link rel="shortcut icon" href="../favicon.ico">
+  </head>
+  <body onload="prettyPrint()">
+    <div id="wrap">
+
+	<!-- Fixed navbar -->
+    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="http://geronimo.apache.org/new-site/">Apache Geronimo</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li><a href="http://geronimo.apache.org/new-site/index.html">Home</a></li>
+            <li><a href="http://geronimo.apache.org/new-site/about.html">About</a></li>
+            <li><a href="http://geronimo.apache.org/new-site/contact.html">Contact</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Projects <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                  <li><a href="http://geronimo.apache.org/new-site/config">Config</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/safeguard">Safeguard</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/specs">Specs</a></li>
+                  <li><a href="http://geronimo.apache.org/new-site/xbean">XBean</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+    <div class="container">	
+	<div class="page-header">
+		<h1>Geronimo Config User Guide</h1>
+	</div>
+
+	<p><em>19 September 2017</em></p>
+
+	<p><div id="preamble">
+<div class="sectionbody">
+<div class="paragraph">
+<p>To get started with Geronimo Config, you&#8217;ll want to add the dependencies to the project.  Eclipse MicroProfile Config is a transitive dependency, it will come in automatically as a dependency.</p>
+</div>
+<div class="paragraph">
+<p>If you&#8217;re using Maven:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code>&lt;dependency&gt;
+    &lt;groupId&gt;org.apache.geronimo.config&lt;/groupId&gt;
+    &lt;artifactId&gt;geronimo-config-impl&lt;/artifactId&gt;
+    &lt;version&gt;1.0&lt;/version&gt;
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you&#8217;re using Gradle:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code>dependencies {
+     compile 'org.apache.geronimo.config:geronimo-config-impl:1.0'
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_general_use_cases">General Use Cases</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_registering_config_sources">Registering Config Sources</h3>
+<div class="paragraph">
+<p><code>ConfigSource</code> implementations can be registered via <code>ServiceLoader</code>.  Declare a <code>ServiceLoader</code> of type <code>ConfigSource</code> or <code>ConfigSourceProvider</code> to <a href="https://github.com/eclipse/microprofile-config/blob/1.1/spec/src/main/asciidoc/configsources.asciidoc#custom-configsources">register these classes</a>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_default_config_sources">Default Config Sources</h3>
+<div class="paragraph">
+<p>By default, we register a <code>ConfigSource</code> for System Properties as well as Environment Variables.</p>
+</div>
+<div class="paragraph">
+<p>Environment Variables are attempted using both <code>.</code> as well as <code>_</code>, meaning a property lookup for <code>my.config.property</code> will search both <code>my.config.property</code> as well as <code>my_config_property</code>, to conform to naming convention standards for environment variables.</p>
+</div>
+<div class="paragraph">
+<p>System Properties are loaded on start up, copying the values into the config source instance.  You can change this behavior by:
+- disabling default config source loading, and manually registering a <code>SystemPropertyConfigSource</code> passing in <code>false</code> in the constructor
+- Set the system property <code>org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy</code> to <code>false</code></p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_cdi_use_cases">CDI Use Cases</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Being an implementation of a MicroProfile specification, it favors use cases based on CDI.  Most of the heavy lifting is done for you when using CDI.</p>
+</div>
+<div class="sect2">
+<h3 id="_injecting_config">Injecting Config</h3>
+<div class="paragraph">
+<p>The MicroProfile <code>Config</code> interface is supported as an injection point.  It is an <code>@ApplicationScoped</code> bean, loaded from the result of <code>ConfigProvider.getConfig()</code>.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code>@Inject
+private Config config</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Will allow you to use the default <code>Config</code> object for your application.  All of the operations of <code>Config</code> match the MicroProfile Specification.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_injecting_config_properties">Injecting Config Properties</h3>
+<div class="paragraph">
+<p>Injecting <code>@ConfigProperty</code> <a href="https://github.com/eclipse/microprofile-config/blob/1.1/spec/src/main/asciidoc/configexamples.asciidoc#simple-dependency-injection-example">works based on the specification</a>.</p>
+</div>
+<div class="paragraph">
+<p>In addition to the defined supported types, Geronimo Config supports injecting <code>Supplier&lt;T&gt;</code> where <code>T</code> is any type that has a supported <code>Converter</code>.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_non_cdi_use_cases">Non-CDI Use Cases</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>You may not be using CDI, or do not want to use the built in CDI integration.  You can then using the programmatic look up for the configuration.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">Config config = ConfigProviderResolver.instance().getBuilder()
+    .addDefaultSources() // built in config sources (system properties, environment variables and microprofile-config.properties
+    .addDiscoveredConverters() // converters discovered via ServiceLoader
+    .addDiscoveredSources() // sources discovered via ServiceLoader
+    .withConverters() // list of converter instances, cannot be lambda expressions
+    .withSources() // list of config source instances
+    .forClassLoader() // the classloader associated with this config
+    .build()</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This will register and build a <code>Config</code> object for use.  You will need to keep track of that created instance.  If you want it to be managed automatically, you can then register it</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="prettyprint highlight"><code class="language-java" data-lang="java">ConfigProviderResolver.instance().registerConfig(config, classLoader);</code></pre>
+</div>
+</div>
+</div>
+</div></p>
+
+	<hr />
+
+		</div>
+		<div id="push"></div>
+    </div>
+    
+    <div id="footer">
+      <div class="container">
+        <p class="muted credit">&copy; 2014 | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.1.1</a> | Baked with <a href="http://jbake.org">JBake v2.5.1</a></p>
+      </div>
+    </div>
+    
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="../js/jquery-1.11.1.min.js"></script>
+    <script src="../js/bootstrap.min.js"></script>
+    <script src="../js/prettify.js"></script>
+    
+  </body>
+</html>
\ No newline at end of file
diff --git a/feed.xml b/feed.xml
index 78fd12f..51d90ba 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
     <atom:link href="http://geronimo.apache.org/new-site//feed.xml" rel="self" type="application/rss+xml" />
     <description>JBake Bootstrap Template</description>
     <language>en-gb</language>
-    <pubDate>Fri, 15 Sep 2017 01:24:13 +0000</pubDate>
-    <lastBuildDate>Fri, 15 Sep 2017 01:24:13 +0000</lastBuildDate>
+    <pubDate>Wed, 20 Sep 2017 02:23:11 +0000</pubDate>
+    <lastBuildDate>Wed, 20 Sep 2017 02:23:11 +0000</lastBuildDate>
 
 
   </channel> 
diff --git a/sitemap.xml b/sitemap.xml
index 05ffba0..85be688 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
     <url>
+        <loc>http://geronimo.apache.org/new-site//config/downloads.html</loc>
+        <lastmod>2017-09-19</lastmod>
+    </url>
+    <url>
+        <loc>http://geronimo.apache.org/new-site//config/index.html</loc>
+        <lastmod>2017-09-19</lastmod>
+    </url>
+    <url>
+        <loc>http://geronimo.apache.org/new-site//config/userguide.html</loc>
+        <lastmod>2017-09-19</lastmod>
+    </url>
+    <url>
         <loc>http://geronimo.apache.org/new-site//contact.html</loc>
         <lastmod>2017-09-05</lastmod>
     </url>
@@ -20,8 +32,4 @@
         <loc>http://geronimo.apache.org/new-site//about.html</loc>
         <lastmod>2013-09-24</lastmod>
     </url>
-    <url>
-        <loc>http://geronimo.apache.org/new-site//config/index.html</loc>
-        <lastmod>2013-09-24</lastmod>
-    </url>
 </urlset>