Merge remote-tracking branch 'origin/master'

pull/43/head
scotty 2016-02-16 14:20:01 -08:00
commit 05d3f39510
3 changed files with 40 additions and 19 deletions

17
_data/v1_1/overrides.yml Normal file
View File

@ -0,0 +1,17 @@
overrides:
- path: v1.1/docs/design
- path: v1.1/docs/man
- path: v1.1/docs/proposals
- path: v1.1/docs/api-reference
- path: v1.1/docs/user-guide/kubectl
- path: v1.1/docs/admin/kube-apiserver.md
- path: v1.1/docs/admin/kube-controller-manager.md
- path: v1.1/docs/admin/kube-proxy.md
- path: v1.1/docs/admin/kube-scheduler.md
- path: v1.1/docs/admin/kubelet.md
- path: v1.0/docs/user-guide/kubectl
- path: v1.0/docs/admin/kube-apiserver.md
- path: v1.0/docs/admin/kube-controller-manager.md
- path: v1.0/docs/admin/kube-proxy.md
- path: v1.0/docs/admin/kube-scheduler.md
- path: v1.0/docs/admin/kubelet.md

View File

@ -7,46 +7,46 @@ toc:
- title: Clustered Application Samples
section:
- title: Apache Cassandra Database
path: /v1.1/examples/cassandra/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/cassandra
- title: Apache Spark
path: /v1.1/examples/spark/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/spark
- title: Apache Storm
path: /v1.1/examples/storm/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/storm
- title: Distributed Task Queue
path: /v1.1/examples/celery-rabbitmq/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/celery-rabbitmq
- title: Hazelcast
path: /v1.1/examples/hazelcast/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/hazelcast
- title: Meteor Applications
path: /v1.1/examples/meteor/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/meteor/
- title: Redis
path: /v1.1/examples/redis/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/redis/
- title: RethinkDB
path: /v1.1/examples/rethinkdb/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/rethinkdb/
- title: Elasticsearch/Kibana Logging Demonstration
path: /v1.1/docs/user-guide/logging-demo/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/logging-demo/
- title: Elasticsearch
path: /v1.1/examples/elasticsearch/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/elasticsearch/
- title: OpenShift Origin
path: /v1.1/examples/openshift-origin/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/openshift-origin/
- title: Ceph
path: /v1.1/examples/rbd/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/rbd/
- title: Persistent Volume Samples
section:
- title: WordPress on a Kubernetes Persistent Volume
path: /v1.1/examples/mysql-wordpress-pd/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/mysql-wordpress-pd/
- title: GlusterFS
path: /v1.1/examples/glusterfs/README/
path: /https://github.com/kubernetes/kubernetes/tree/master/examples/glusterfs/
- title: iSCSI
path: /v1.1/examples/iscsi/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/iscsi/
- title: NFS
path: /v1.1/examples/nfs/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/nfs/
- title: Multi-tier Application Samples
section:
- title: Guestbook - Go Server
path: /v1.1/examples/guestbook-go/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/guestbook-go/
- title: GuestBook - PHP Server
path: /v1.1/examples/guestbook/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/guestbook/
- title: MySQL - Phabricator Server
path: /v1.1/examples/phabricator/README/
path: https://github.com/kubernetes/kubernetes/tree/master/examples/phabricator/

View File

@ -3,6 +3,10 @@ layout: headerfooter
---
<!-- HERO -->
{% for thistoc in site.data[page.versionfilesafe].globals.tocs %}{% if foundTOC %}{% break %}{% else %}{% assign tree = site.data[page.versionfilesafe][thistoc].toc %}{% include tocsearch.html %}{% endif %}{% endfor %}
{% for override in site.data.overrides.overrides %}
<script>console.log('thispage.path={{ override.path }}, page.path={{ page.path }}')</script>
{% if page.path == override.path %}{% assign hideTitle="true" %}{% endif %}
{% endfor %}
<section id="hero" class="light-text">
<h1>{{ site.data[page.versionfilesafe][foundTOC].bigheader }}</h1>
<h5>{{ site.data[page.versionfilesafe][foundTOC].abstract }}</h5>