From a6be49a5a5ec9d2626e33eb1ee974173567cd6b6 Mon Sep 17 00:00:00 2001
From: Etienne Tremel <etienne.tremel@container-solutions.com>
Date: Mon, 9 Oct 2017 17:38:46 +0200
Subject: [PATCH 1/3] Fix all deployment link

---
 _includes/header.html                                  |  4 ++--
 assets/css/custom.scss                                 |  4 ++--
 .../deployment}/apcera.md                              |  0
 {deployment => microservices-demo/deployment}/dc-os.md |  0
 .../deployment}/docker-compose-weave.md                |  0
 .../deployment}/docker-compose.md                      |  0
 .../deployment}/docker-swarm-weave.md                  |  0
 .../deployment}/docker-swarm.md                        |  0
 .../deployment}/ecs-weave-shippable.md                 |  0
 {deployment => microservices-demo/deployment}/ecs.md   |  0
 .../deployment}/kubernetes-minikube.md                 |  0
 .../deployment}/kubernetes-start.md                    | 10 ++++++----
 .../deployment}/kubernetes.md                          |  0
 .../deployment}/mesos-cni.md                           |  0
 .../deployment}/mesos-marathon.md                      |  0
 .../deployment}/micro-sock.md                          |  0
 .../deployment}/minimesos-marathon.md                  |  0
 .../deployment}/monitoring-docker-compose.md           |  0
 .../deployment}/monitoring-kubernetes.md               |  0
 {deployment => microservices-demo/deployment}/nomad.md |  0
 20 files changed, 10 insertions(+), 8 deletions(-)
 rename {deployment => microservices-demo/deployment}/apcera.md (100%)
 rename {deployment => microservices-demo/deployment}/dc-os.md (100%)
 rename {deployment => microservices-demo/deployment}/docker-compose-weave.md (100%)
 rename {deployment => microservices-demo/deployment}/docker-compose.md (100%)
 rename {deployment => microservices-demo/deployment}/docker-swarm-weave.md (100%)
 rename {deployment => microservices-demo/deployment}/docker-swarm.md (100%)
 rename {deployment => microservices-demo/deployment}/ecs-weave-shippable.md (100%)
 rename {deployment => microservices-demo/deployment}/ecs.md (100%)
 rename {deployment => microservices-demo/deployment}/kubernetes-minikube.md (100%)
 rename {deployment => microservices-demo/deployment}/kubernetes-start.md (89%)
 rename {deployment => microservices-demo/deployment}/kubernetes.md (100%)
 rename {deployment => microservices-demo/deployment}/mesos-cni.md (100%)
 rename {deployment => microservices-demo/deployment}/mesos-marathon.md (100%)
 rename {deployment => microservices-demo/deployment}/micro-sock.md (100%)
 rename {deployment => microservices-demo/deployment}/minimesos-marathon.md (100%)
 rename {deployment => microservices-demo/deployment}/monitoring-docker-compose.md (100%)
 rename {deployment => microservices-demo/deployment}/monitoring-kubernetes.md (100%)
 rename {deployment => microservices-demo/deployment}/nomad.md (100%)

diff --git a/_includes/header.html b/_includes/header.html
index b005926..d180add 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,11 +1,11 @@
 <div class="header clearfix">
-<div class="header-home"><a href="{{site.main_url_prefix}}/">Sock Shop</a></div>
+<div class="header-home"><a href="/">Sock Shop</a></div>
 <nav>
   <ul class="nav header-nav">
     <li class="{% if include.quickstart %}active{% endif %}"><a href="/docs/quickstart.html">Quickstart</a></li>
     <li class="{% if include.docs %}active{% endif %}"><a href="/docs/index.html">Docs</a></li>
     <li class="{% if include.api %}active{% endif %}"><a href="/api/index.html">API</a></li>
-    <li><a href="http://github.com/microservices-demo" target="_blank">GitHub</a></li>
+    <li><a href="https://github.com/microservices-demo" target="_blank">GitHub</a></li>
   </ul>
 </nav>
 </div>
diff --git a/assets/css/custom.scss b/assets/css/custom.scss
index 6ac2f8f..f2a941b 100644
--- a/assets/css/custom.scss
+++ b/assets/css/custom.scss
@@ -60,7 +60,7 @@ code.highlighter-rouge {
   font-weight: bold;
   margin: 0.3em 0 0;
   padding: 0 0 0 30px;
-  background-image: url({{ site.deploy_doc_url_prefix }}/assets/img/weaveworks-logo.png);
+  background-image: url(/assets/img/weaveworks-logo.png);
   background-repeat: no-repeat;
   background-position-y: 0.3em;
   background-size: 1em 1em;
@@ -95,7 +95,7 @@ code.highlighter-rouge {
 }
 
 .hero-banner {
-  background: url(../img/hero_socks.png);
+  background: url(/assets/img/hero_socks.png);
   margin: 0 0 2em;
 }
 
diff --git a/deployment/apcera.md b/microservices-demo/deployment/apcera.md
similarity index 100%
rename from deployment/apcera.md
rename to microservices-demo/deployment/apcera.md
diff --git a/deployment/dc-os.md b/microservices-demo/deployment/dc-os.md
similarity index 100%
rename from deployment/dc-os.md
rename to microservices-demo/deployment/dc-os.md
diff --git a/deployment/docker-compose-weave.md b/microservices-demo/deployment/docker-compose-weave.md
similarity index 100%
rename from deployment/docker-compose-weave.md
rename to microservices-demo/deployment/docker-compose-weave.md
diff --git a/deployment/docker-compose.md b/microservices-demo/deployment/docker-compose.md
similarity index 100%
rename from deployment/docker-compose.md
rename to microservices-demo/deployment/docker-compose.md
diff --git a/deployment/docker-swarm-weave.md b/microservices-demo/deployment/docker-swarm-weave.md
similarity index 100%
rename from deployment/docker-swarm-weave.md
rename to microservices-demo/deployment/docker-swarm-weave.md
diff --git a/deployment/docker-swarm.md b/microservices-demo/deployment/docker-swarm.md
similarity index 100%
rename from deployment/docker-swarm.md
rename to microservices-demo/deployment/docker-swarm.md
diff --git a/deployment/ecs-weave-shippable.md b/microservices-demo/deployment/ecs-weave-shippable.md
similarity index 100%
rename from deployment/ecs-weave-shippable.md
rename to microservices-demo/deployment/ecs-weave-shippable.md
diff --git a/deployment/ecs.md b/microservices-demo/deployment/ecs.md
similarity index 100%
rename from deployment/ecs.md
rename to microservices-demo/deployment/ecs.md
diff --git a/deployment/kubernetes-minikube.md b/microservices-demo/deployment/kubernetes-minikube.md
similarity index 100%
rename from deployment/kubernetes-minikube.md
rename to microservices-demo/deployment/kubernetes-minikube.md
diff --git a/deployment/kubernetes-start.md b/microservices-demo/deployment/kubernetes-start.md
similarity index 89%
rename from deployment/kubernetes-start.md
rename to microservices-demo/deployment/kubernetes-start.md
index e058aaf..1d57359 100644
--- a/deployment/kubernetes-start.md
+++ b/microservices-demo/deployment/kubernetes-start.md
@@ -19,7 +19,9 @@ This explains how to deploy the Sock Shop onto any existing Kubernetes cluster.
 
 1. [Clone the microservices-demo repository](https://github.com/microservices-demo/microservices-demo)
 2. Go to the *deploy/kubernetes* folder
-    ```
-    kubectl create namespace sock-shop
-    kubectl apply -f complete-demo.yaml
-    ```
+
+```
+kubectl create namespace sock-shop
+
+kubectl apply -f complete-demo.yaml
+```
diff --git a/deployment/kubernetes.md b/microservices-demo/deployment/kubernetes.md
similarity index 100%
rename from deployment/kubernetes.md
rename to microservices-demo/deployment/kubernetes.md
diff --git a/deployment/mesos-cni.md b/microservices-demo/deployment/mesos-cni.md
similarity index 100%
rename from deployment/mesos-cni.md
rename to microservices-demo/deployment/mesos-cni.md
diff --git a/deployment/mesos-marathon.md b/microservices-demo/deployment/mesos-marathon.md
similarity index 100%
rename from deployment/mesos-marathon.md
rename to microservices-demo/deployment/mesos-marathon.md
diff --git a/deployment/micro-sock.md b/microservices-demo/deployment/micro-sock.md
similarity index 100%
rename from deployment/micro-sock.md
rename to microservices-demo/deployment/micro-sock.md
diff --git a/deployment/minimesos-marathon.md b/microservices-demo/deployment/minimesos-marathon.md
similarity index 100%
rename from deployment/minimesos-marathon.md
rename to microservices-demo/deployment/minimesos-marathon.md
diff --git a/deployment/monitoring-docker-compose.md b/microservices-demo/deployment/monitoring-docker-compose.md
similarity index 100%
rename from deployment/monitoring-docker-compose.md
rename to microservices-demo/deployment/monitoring-docker-compose.md
diff --git a/deployment/monitoring-kubernetes.md b/microservices-demo/deployment/monitoring-kubernetes.md
similarity index 100%
rename from deployment/monitoring-kubernetes.md
rename to microservices-demo/deployment/monitoring-kubernetes.md
diff --git a/deployment/nomad.md b/microservices-demo/deployment/nomad.md
similarity index 100%
rename from deployment/nomad.md
rename to microservices-demo/deployment/nomad.md

From d257ab8caa8b8fc573fe1c987558e2ca99ecc9ec Mon Sep 17 00:00:00 2001
From: Etienne Tremel <etienne.tremel@container-solutions.com>
Date: Mon, 9 Oct 2017 17:39:12 +0200
Subject: [PATCH 2/3] Bump copyright to 2017

---
 404.html                 | 2 +-
 _layouts/api.html        | 2 +-
 _layouts/default.html    | 2 +-
 _layouts/quickstart.html | 4 ++--
 index.html               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/404.html b/404.html
index 136af82..fea3b96 100644
--- a/404.html
+++ b/404.html
@@ -85,7 +85,7 @@ <h3><a id="user-content-visualizing-the-application" class="anchor" href="#visua
 -->
 
       <div class="footer">
-        <p>&copy;2016 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
+        <p>&copy;2017 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
       </div>
 
     </div>
diff --git a/_layouts/api.html b/_layouts/api.html
index 580e9a7..bf78cd4 100644
--- a/_layouts/api.html
+++ b/_layouts/api.html
@@ -45,7 +45,7 @@ <h1>API</h1>
       </div>
 
       <div class="footer">
-        <p>&copy;2016 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
+        <p>&copy;2017 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
       </div>
     </div>
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 233346c..756f222 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -39,7 +39,7 @@ <h1>Documentation</h1>
       </div>
 
       <div class="footer">
-        <p>&copy;2016 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
+        <p>&copy;2017 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
       </div>
 
     </div>
diff --git a/_layouts/quickstart.html b/_layouts/quickstart.html
index 280a97d..70d0d83 100644
--- a/_layouts/quickstart.html
+++ b/_layouts/quickstart.html
@@ -26,7 +26,7 @@
 
       <div class="inner">
         <h1>Documentation</h1>
-        
+
         <div class="row">
           <div class="col-sm-3">
             {% include doc_menu.html %}
@@ -39,7 +39,7 @@ <h1>Documentation</h1>
       </div>
 
       <div class="footer">
-        <p>&copy;2016 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
+        <p>&copy;2017 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
       </div>
 
     </div>
diff --git a/index.html b/index.html
index 31d84d2..c2fe699 100644
--- a/index.html
+++ b/index.html
@@ -113,7 +113,7 @@ <h3><a id="user-content-visualizing-the-application" class="anchor" href="#visua
       </div>
 
       <div class="footer">
-        <p>&copy;2016 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
+        <p>&copy;2017 <a href="http://weave.works/" target="_blank">Weaveworks, Inc</a></p>
       </div>
 
     </div>

From ddb9fbdf1d01d4d51d3e53553139def49cf44cf2 Mon Sep 17 00:00:00 2001
From: Etienne Tremel <etienne.tremel@container-solutions.com>
Date: Mon, 9 Oct 2017 17:39:57 +0200
Subject: [PATCH 3/3] Remove dev config, add instruction on how to get started

---
 README.md          | 16 +++++++++++++---
 _config.yml        |  6 ------
 _config.yml.dev    | 12 ------------
 docker-compose.yml |  1 -
 4 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 _config.yml.dev

diff --git a/README.md b/README.md
index b6d2890..bff1b57 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,15 @@
-This directory contains the deployment and internal documentation.
+microservices-demo documentation
+================================
 
-Both are published on https://microservices-demo.github.io/microservices-demo/.
+> This directory contains the deployment and internal documentation.
+It is published at [microservices-demo.github.io](https://microservices-demo.github.io)
 
-There is a docker-compose included for local development. Note that it mounts `_config.yml.dev` in the place of `_config.yml`, to enable local linking.
+
+## Getting started
+
+There is a [docker-compose](https://docs.docker.com/compose/) included for
+local development, use the following command to start it:
+
+```
+docker-compose up
+```
diff --git a/_config.yml b/_config.yml
index 9178aef..ec73fd6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,9 +1,3 @@
-# Production settings
-
-baseurl: ""
-deploy_doc_url_prefix: https://microservices-demo.github.io/microservices-demo
-main_url_prefix: https://microservices-demo.github.io
-
 # Build settings
 markdown: kramdown
 exclude:
diff --git a/_config.yml.dev b/_config.yml.dev
deleted file mode 100644
index 71b6670..0000000
--- a/_config.yml.dev
+++ /dev/null
@@ -1,12 +0,0 @@
-# Development settings
-
-baseurl: ""
-url: "https://microservices-demo.github.io"
-deploy_doc_url_prefix: https://microservices-demo.github.io/microservices-demo
-main_url_prefix: ""
-
-# Build settings
-markdown: kramdown
-exclude:
-  - Gemfile
-  - Gemfile.lock
diff --git a/docker-compose.yml b/docker-compose.yml
index 2976981..456dddf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,4 +13,3 @@ services:
       - 4000:4000
     volumes:
       - .:/srv/jekyll
-      - $PWD/_config.yml.dev:/srv/jekyll/_config.yml