More shuffling and cleanup.

_includes/doc-side-concepts-nav.html

@@ -2,7 +2,7 @@
 	{% assign current = page.url | downcase | split: '/' %}
 	<li><h5 class="doc-side-nav-title">Concepts</h5></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/concepts/what-is-istio.html" {% if current[3] == 'what-is-istio.html' %}class='current'{% endif %}>What is Istio?</a></li>
-	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/concepts/model.html" {% if current[3] == 'model.html' %}class='current'{% endif %}>Service Model</a></li>
+	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/concepts/service-model.html" {% if current[3] == 'service-model.html' %}class='current'{% endif %}>Service Model</a></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/concepts/attributes.html" {% if current[3] == 'attributes.html' %}class='current'{% endif %}>Attributes</a></li>
 
 	<li class="submenu">

_includes/doc-side-reference-nav.html

@@ -2,7 +2,7 @@
 	{% assign current = page.url | downcase | split: '/' %}
 	<li><h5 class="doc-side-nav-title">Reference</h5></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/istioctl.html" {% if current[3] == 'istioctl.html' %}class='current'{% endif %}>The istioctl Command</a></li>
-	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/rule-dsl.html" {% if current[3] == 'rule-dsl.html' %}class='current'{% endif %}>Routing and Traffic Management</a></li>
+	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/routing-and-traffic-management.html" {% if current[3] == 'routing-and-traffic-management.html' %}class='current'{% endif %}>Routing and Traffic Management</a></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/attribute-vocabulary.html" {% if current[3] == 'attribute-vocabulary.html' %}class='current'{% endif %}>Attribute Vocabulary</a></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/glossary.html" {% if current[3] == 'glossary.html' %}class='current'{% endif %}>Glossary</a></li>
 	<li class="doc-side-nav-list-item"><a href="{{ site.baseurl }}/docs/reference/release-notes.html" {% if current[3] == 'release-notes.html' %}class='current'{% endif %}>Release Notes</a></li>

docs/concepts/index.md

@@ -11,3 +11,20 @@ type: markdown
 
 Concepts help you learn about the different parts
 of the Istio system and the abstractions it uses.
+
+- [What is Istio?](./what-is-istio.html). Provides a broad overview of what
+problems Istio is designed to solve as well as presenting its high-level
+architecture,
+
+- [Service Model](./service-model.html). Describes how services are modeled
+within the Istio mesh.
+
+- [Attributes](./attributes.html). Explains the important notion of attributes, which
+is a central mechanism for how policies and control are applied to services within the
+mesh.
+
+- [Mixer](./mixer.html). Architectural deep-dive into the design of Mixer, which provides
+the policy and control mechanisms within the service mesh.
+
+- [Mixer Configuration](./mixer-config.html). An overview of the key concepts used to configure
+Mixer.

docs/concepts/mixer.md

@@ -184,7 +184,7 @@ subsequent phases.
 
 - **Attribute Processing**. The third phase takes the total set of attributes
 and produces a set of *adapter parameters*. Attribute processing is initially
-configured through a simple declarative form as described [here]({{site.baseurl}}/docs/config.html).
+configured through a simple declarative form as described [here]({{site.baseurl}}/docs/mixer-config.html).
 
 - **Adapter Dispatching**. The Resolution phase establishes the set of available aspects and the Attribute
 Processing phase creates a set of adapter parameters. The Adapter Dispatching phase invokes the adapters

docs/reference/contribute/index.md

@@ -11,23 +11,23 @@ type: markdown
 
 This section teaches you how to contribute to the Istio documentation effort.
 
-- [Editing Docs]({{site.baseurl}}/docs/home/contribute/editing.html). Lets you start editing this
+- [Editing Docs](./editing.html). Lets you start editing this
 site's documentation.
 
-- [Creating a Pull Request]({{site.baseurl}}/docs/home/contribute/creating-a-pull-request.html). Shows you
+- [Creating a Pull Request](./creating-a-pull-request.html). Shows you
 how to create a GitHub pull request in order to submit your docs for approval.
 
-- [Writing a New Topic]({{site.baseurl}}/docs/home/contribute/writing-a-new-topic.html). Explains the
+- [Writing a New Topic](./writing-a-new-topic.html). Explains the
 mechanics of creating new documentation pages.
 
-- [Staging Your Changes]({{site.baseurl}}/docs/home/contribute/staging-your-changes.html). Explains how
+- [Staging Your Changes](./staging-your-changes.html). Explains how
 to test out your changes locally before submitting them.
 
-- [Using Page Templates]({{site.baseurl}}/docs/home/contribute/using-page-templates.html). Presents
+- [Using Page Templates](./using-page-templates.html). Presents
 the documentation templating model which is used to make Istio docs consistent.
 
-- [Reviewing Doc Issues]({{site.baseurl}}/docs/home/contribute/reviewing-doc-issues.html). Explains
+- [Reviewing Doc Issues](./reviewing-doc-issues.html). Explains
 the process involved in accepting documentation updates.
 
-- [Style Guide]({{site.baseurl}}/docs/home/contribute/style-guide.html). Explains the dos and donts
+- [Style Guide](./style-guide.html). Explains the dos and donts
 of writing Istio docs.

docs/reference/index.md

@@ -12,3 +12,22 @@ type: markdown
 The Reference section contains detailed authoritative reference
 material such as command-line options, configuration options,
 and API calling parameters.
+
+- [istioctl](./istioctl.md). Describes the usage and option of the `istioctl` command-line
+tool.
+
+- [Routing and Traffic Management](./routing-and-traffic-management.md). Describes how to 
+configure Istio's Layer 4 & 7 routing logic.
+
+- [Attribute Vocabulary](./attribute-vocabulary.md). Describes the base attribute
+vocabulary used for policy and control.
+
+- [Glossary](./glossary.md). A glossary of common Istio term.s
+
+- [Release Notes](./release-notes.md). What's been happening with Istio.
+
+- [Roadmap](./release-roadmap.md). What Istio will become in the coming months.
+
+- [Writing Configuration](./writing-config.md). How to write Istio config YAML content.
+
+- [Contributing to the Docs](./contribute/index.md). See how you can help make these docs better.

docs/reference/routing-and-traffic-management.md

@@ -12,7 +12,7 @@ sidenav: doc-side-reference-nav.html
 Istio provides a simple Domain-specific language (DSL) to
 control how API calls and layer-4 traffic flow across various
 microservices in the application deployment. The DSL is a
-[YAML mapping](../concepts/writing-config.md) of a
+[YAML mapping](../reference/writing-config.md) of a
 [protobuf](https://developers.google.com/protocol-buffers/docs/proto3)
 schema documented [here](https://github.com/istio/api/blob/master/proxy/v1/config/cfg.md).
 The DSL allows the operator to

docs/samples/index.md

@@ -11,5 +11,5 @@ type: markdown
 Samples include a variety of fully working 
 example uses for Istio that you can experiment with.
 
-- [BookInfo]({{site.baseurl}}/docs/samples/bookinfo.html). This sample deploys a simple app that displays information about a
+- [BookInfo](./bookinfo.html). This sample deploys a simple app that displays information about a
 book, similar to a single catalog entry of an online book store.

docs/tasks/index.md

@@ -11,7 +11,7 @@ type: markdown
 Tasks show you how to do a single specific targeted
 activity with the Istio system.
 
-- [Getting Started]({{site.baseurl}}/docs/tasks/getting-started.html). This task shows you how to get
+- [Getting Started](./getting-started.html). This task shows you how to get
 Istio setup.
 
-- [Timeout Injection]({{site.baseurl}}/docs/tasks/timeout-injection.html). This task shows how to set a network timeout for all requests for a destination.
+- [Timeout Injection](./timeout-injection.html). This task shows how to set a network timeout for all requests for a destination.