From 110bd755223dce2757005eac3e089a7d16ee5f36 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Fri, 16 Jun 2017 21:39:41 +0000
Subject: [PATCH] Sync docs from 1.0.x to gh-pages

---
 1.0.x/index.html | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/1.0.x/index.html b/1.0.x/index.html
index a117a515..136a8056 100644
--- a/1.0.x/index.html
+++ b/1.0.x/index.html
@@ -512,7 +512,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ src/test/bash/install_vault.sh</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ src/test/bash/install_vault.sh</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -520,7 +520,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ src/test/bash/create_certificates.sh</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ src/test/bash/create_certificates.sh</code></pre>
 </div>
 </div>
 <div class="admonitionblock note">
@@ -540,20 +540,35 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ src/test/bash/local_run_vault.sh</pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ src/test/bash/local_run_vault.sh</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Vault is started listening on <code>0.0.0.0:8200</code> using the <code>inmem</code> storage and
 <code>https</code>.
-Vault is sealed and not initialized when starting up
-so you need to initialize it first.</p>
+Vault is sealed and not initialized when starting up.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+If you want to run tests, leave Vault uninitialized. The tests will
+initialize Vault and create a root token <code>00000000-0000-0000-0000-000000000000</code>.
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>If you want to use Vault for your application or give it a try then you need to initialize it first.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ export VAULT_ADDR="https://localhost:8200"
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ export VAULT_ADDR="https://localhost:8200"
 $ export VAULT_SKIP_VERIFY=true # Don't do this for production
-$ vault init</pre>
+$ vault init</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -561,7 +576,7 @@ $ vault init</pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>Key 1: 7149c6a2e16b8833f6eb1e76df03e47f6113a3288b3093faf5033d44f0e70fe701
+<pre class="highlight"><code class="language-bash" data-lang="bash">Key 1: 7149c6a2e16b8833f6eb1e76df03e47f6113a3288b3093faf5033d44f0e70fe701
 Key 2: 901c534c7988c18c20435a85213c683bdcf0efcd82e38e2893779f152978c18c02
 Key 3: 03ff3948575b1165a20c20ee7c3e6edf04f4cdbe0e82dbff5be49c63f98bc03a03
 Key 4: 216ae5cc3ddaf93ceb8e1d15bb9fc3176653f5b738f5f3d1ee00cd7dccbe926e04
@@ -574,7 +589,7 @@ restarted, or stopped, you must provide at least 3 of these keys
 to unseal it again.
 
 Vault does not store the master key. Without at least 3 keys,
-your Vault will remain permanently sealed.</pre>
+your Vault will remain permanently sealed.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -584,10 +599,12 @@ Pick 3 keys and unseal Vault. Store the Vault token in the <code>VAULT_TOKEN</co
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>$ vault unseal (Key 1)
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ vault unseal (Key 1)
 $ vault unseal (Key 2)
 $ vault unseal (Key 3)
-$ export VAULT_TOKEN=(Root token)</pre>
+$ export VAULT_TOKEN=(Root token)
+# Required to run Spring Cloud Vault tests after manual initialization
+$ vault token-create -id="00000000-0000-0000-0000-000000000000" -policy="root"</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -630,7 +647,7 @@ the test cases). Example Maven configuration:</p>
 <pre class="highlight"><code class="language-xml" data-lang="xml">&lt;parent&gt;
     &lt;groupId&gt;org.springframework.boot&lt;/groupId&gt;
     &lt;artifactId&gt;spring-boot-starter-parent&lt;/artifactId&gt;
-    &lt;version&gt;1.5.2.RELEASE&lt;/version&gt;
+    &lt;version&gt;1.5.4.RELEASE&lt;/version&gt;
     &lt;relativePath /&gt; &lt;!-- lookup parent from repository --&gt;
 &lt;/parent&gt;