- ©2016 Weaveworks, Inc
+ ©2017 Weaveworks, Inc
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/_includes/header.html b/_includes/header.html
index b005926..d180add 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,11 +1,11 @@
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 @@ API
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 @@ Documentation
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 @@
Documentation
-
+
{% include doc_menu.html %}
@@ -39,7 +39,7 @@
Documentation
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/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
diff --git a/index.html b/index.html
index 31d84d2..c2fe699 100644
--- a/index.html
+++ b/index.html
@@ -113,7 +113,7 @@
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