Some structural cleanup.

Author: Martin Taillefer

_includes/templates/concept-overview.md

@@ -15,7 +15,7 @@ This page presents an architectural overview for the Istio service mesh.
 
 ## High-level architecture
 
-<img src="./arch.svg" alt="The overall architecture of an Istio-based application." />
+<img src="./img/architecture/arch.svg" alt="The overall architecture of an Istio-based application." />
 
 ### The sidecar model
 

docs/concepts/architecture.md

@@ -24,7 +24,7 @@ management. Services that leverage Mixer in this way are abstracted from environ
 easing the process of hosting the code in different environments (different clouds and on-prem). (Please note that 
 as of the Alpha release of Istio, only Envoy can calls Mixer directly.)
 
-<img style="display:block;width:60%;margin:auto;" src="./mixer/traffic.svg" alt="Flow of traffic." />
+<img style="display:block;width:60%;margin:auto;" src="./img/mixer/traffic.svg" alt="Flow of traffic." />
 <p style="text-align:center;">Mixer Traffic Flow</p>
 
 Mixer provides three core features:
@@ -56,7 +56,7 @@ checking, and more. Adapters enable Mixer to expose a single consistent API, ind
 The exact set of adapters used at runtime is determined through configuration and can easily be extended
 to target new or custom backend systems.
 
-<img style="width:65%;display:block;margin:auto;" src="./mixer/adapters.svg" alt="Mixer and its adapters." />
+<img style="width:65%;display:block;margin:auto;" src="./img/mixer/adapters.svg" alt="Mixer and its adapters." />
 
 ## Configuration state
 
@@ -100,7 +100,7 @@ configured through a simple declarative form as described [here]({{site.baseurl}
 Processing phase creates a set of adapter parameters. The Adapter Dispatching phase invokes the adapters
 associated with each aspect and passes them those parameters.
 
-<img style="display:block;width:50%;margin:auto;" src="./mixer/phases.svg" alt="Phases of mixer request processing" />
+<img style="display:block;width:50%;margin:auto;" src="./img/mixer/phases.svg" alt="Phases of mixer request processing" />
 <p style="text-align:center;">Request Phases</p>
 
 ## Scripting

docs/concepts/arch.png renamed to docs/concepts/img/architecture/arch.png

@@ -28,7 +28,7 @@ There are 3 versions of the reviews microservice:
 
 The end-to-end architecture of the application is shown below.
 
-![Bookinfo app_noistio](../../img/example-app-bookinfo-noistio.svg)
+![Bookinfo app_noistio](./img/bookinfo/noistio.svg)
 
 This application is polyglot, i.e., the microservices are written in different languages.
 
@@ -116,7 +116,7 @@ _Note: The following instructions assume that you have access to a kubernetes cl
    that manages incoming and outgoing calls for the service. The updated diagram looks
    like this:
 
-   ![Bookinfo app](../../img/example-app-bookinfo.svg)
+   ![Bookinfo app](./img/bookinfo/withistio.svg)
 
 
 1. Confirm that all services and pods are correctly defined and running:

docs/concepts/arch.svg renamed to docs/concepts/img/architecture/arch.svg

@@ -1,6 +1,6 @@
 ---
 title: Timeout Injection
-headline: 'Timeout Injection walkthrough'
+headline: 'Timeout Injection'
 sidenav: doc-side-tasks-nav.html
 bodyclass: docs
 layout: docs
@@ -29,7 +29,7 @@ implement the timeout.
 This task assumes you have deployed Istio on Kubernetes.  If you have not done so, please first
 clone the istio GitHub repository and start the core Istio services (the istio-manager, the istio-mixer, and the istio ingress controller).
 
-```shell
+```bash
 git clone https://github.com/istio/istio
 cd istio
 kubectl apply -f ./kubernetes/istio-install
@@ -50,7 +50,7 @@ In this example we use *[httpbin](https://httpbin.org)* and *NGINX* and demonstr
 
 First, let's start httpbin and have it join the Istio service mesh
 
-```shell
+```bash
 # Start the citizenstig/httpbin image in a Kubernetes Pod.  8000 is the httpbin port.
 source ../istio.VERSION
 kubectl create -f <(istioctl kube-inject -f {{site.baseurl}}/docs/tasks/httpbin.yaml)
@@ -65,22 +65,22 @@ we cannot test it from outside the cluster.  To verify that it is working correc
 a _curl_ command against httpbin:8000 *from inside the cluster* using the public _dockerqa/curl_
 image from the Docker hub:
 
-```shell
+```bash
 kubectl run -i --rm --restart=Never dummy --image=dockerqa/curl:ubuntu-trusty --command -- curl --silent httpbin:8000/html
 kubectl run -i --rm --restart=Never dummy --image=dockerqa/curl:ubuntu-trusty --command -- curl --silent httpbin:8000/status/500
 time kubectl run -i --rm --restart=Never dummy --image=dockerqa/curl:ubuntu-trusty --command -- curl --silent httpbin:8000/delay/5
 ```
 
 Next we will start NGINX and configure it to proxy for the httpbin service started in the previous step
 
-```shell
+```bash
 kubectl create -f <(istioctl kube-inject -f {{site.baseurl}}/docs/tasks/nginx-httpbin.yaml)
 ```
 
 To test from outside the cluster we will need the IP address of a Kubernetes node, as well
 as the exposed NodePort port on that node.
 
-```shell
+```bash
 # Get the IP address of the Kubernetes node
 IP=$(kubectl get po -l infra=istio-ingress-controller -o jsonpath={.items[0].status.hostIP})
 NGINX_NODEPORT=$(kubectl get service nginx --output jsonpath='{.spec.ports[0].nodePort}')
@@ -96,7 +96,7 @@ At this point we have two services.  Both are wired through the Istio service me
 Istio has many advanced capabilities to control how network traffic flows between microservices.  One of the
 simplest capabilities is to add a timeout.
 
-```shell
+```bash
 # First, create a rule file
 cat <<EOF > /tmp/httpbin-3s-rule.yaml
 type: route-rule
@@ -119,7 +119,7 @@ three seconds.  Although _httpbin_ was waiting 5 seconds, Istio cut off the requ
 
 To remove the rules, deployments and services used in this task:
 
-```shell
+```bash
 istioctl delete route-rule httpbin-3s-rule
 kubectl delete -f {{site.baseurl}}/docs/tasks/httpbin.yaml
 kubectl delete -f {{site.baseurl}}/docs/tasks/nginx-httpbin.yaml

docs/concepts/mixer/adapters.svg renamed to docs/concepts/img/mixer/adapters.svg

@@ -3,22 +3,6 @@
 title: istio.io
 ---
 <div id="landing-content" class="container landing-content-container">
-    <div class="row" style="width:50%;text-align:center;margin:auto">
-        <br/>
-        <p style="font-size:large">Welcome,</p>
-        <br/>
-        <p style="font-size:large">
-        We're happy you're here, but we want to point out that
-        we're not quite ready for you just yet. We're still
-        getting this site ready for public consumption. You can
-        look around, but please forgive the mess and missing
-        bits.
-        </p>
-        <br/>
-        <p style="font-size:large">- The Istio Team</p>
-        <br/>
-    </div>
-
     <div class="row" >
         <div class="col-md-11 nofloat center-block landing-row">
             <h3 class="col-sm-7 landing-row-title">Rich Layer-7 Routing & Traffic Management</h3>