Merge remote-tracking branch 'origin/master'

This commit is contained in:
scotty
2016-02-12 15:55:33 -08:00
2 changed files with 60 additions and 60 deletions
+41 -41
View File
@@ -5,103 +5,103 @@ toc:
path: /v1.1/reference path: /v1.1/reference
section: section:
- title: Kubernetes API Overview - title: Kubernetes API Overview
path: /v1.1/docs/api.html path: /v1.1/docs/api
- title: Kubernetes API Reference - title: Kubernetes API Reference
path: /v1.1/api-ref.html path: /v1.1/api-ref
- title: kubectl - title: kubectl
section: section:
- title: kubectl Overview - title: kubectl Overview
path: /v1.1/docs/user-guide/kubectl-overview.html path: /v1.1/docs/user-guide/kubectl-overview
- title: kubectl for Docker Users - title: kubectl for Docker Users
path: /v1.1/reference/docker-cli-to-kubectl path: /v1.1/reference/docker-cli-to-kubectl
- title: kubectl Reference (pretend the child nodes are here) - title: kubectl Reference (pretend the child nodes are here)
path: /v1.1/docs/user-guide/kubectl/kubectl.html path: /v1.1/docs/user-guide/kubectl/kubectl
- title: JSONpath - title: JSONpath
path: /v1.1/docs/user-guide/jsonpath.html path: /v1.1/docs/user-guide/jsonpath
- title: kube-apiserver - title: kube-apiserver
section: section:
- title: Overview - title: Overview
path: /v1.1/docs/admin/kube-apiserver.html path: /v1.1/docs/admin/kube-apiserver
- title: Authorization Plugins - title: Authorization Plugins
path: /v1.1/docs/admin/authorization.html path: /v1.1/docs/admin/authorization
- title: Authentication - title: Authentication
path: /v1.1/docs/admin/authentication.html path: /v1.1/docs/admin/authentication
- title: Accessing the API - title: Accessing the API
path: /v1.1/docs/admin/accessing-the-api.html path: /v1.1/docs/admin/accessing-the-api
- title: Admission Controllers - title: Admission Controllers
path: /v1.1/docs/admin/admission-controllers.html path: /v1.1/docs/admin/admission-controllers
- title: Managing Service Accounts - title: Managing Service Accounts
path: /v1.1/docs/admin/service-accounts-admin.html path: /v1.1/docs/admin/service-accounts-admin
- title: kub-scheduler - title: kub-scheduler
path: /v1.1/docs/admin/kube-scheduler.html path: /v1.1/docs/admin/kube-scheduler
- title: kubelet - title: kubelet
path: /v1.1/docs/admin/kubelet.html path: /v1.1/docs/admin/kubelet
- title: kube-proxy - title: kube-proxy
path: /v1.1/docs/admin/kube-proxy.html path: /v1.1/docs/admin/kube-proxy
- title: etcd - title: etcd
path: /v1.1/docs/admin/etcd.html path: /v1.1/docs/admin/etcd
- title: Concept Definitions - title: Concept Definitions
section: section:
- title: Container Environment - title: Container Environment
path: /v1.1/docs/user-guide/container-environment.html path: /v1.1/docs/user-guide/container-environment
- title: Images - title: Images
path: /v1.1/docs/user-guide/images.html path: /v1.1/docs/user-guide/images
- title: Downward API - title: Downward API
path: /v1.1/docs/user-guide/downward-api.html path: /v1.1/docs/user-guide/downward-api
- title: Pods - title: Pods
path: /v1.1/docs/user-guide/pods.html path: /v1.1/docs/user-guide/pods
- title: Labels and Selectors - title: Labels and Selectors
path: /v1.1/docs/user-guide/labels.html path: /v1.1/docs/user-guide/labels
- title: Replication Controller - title: Replication Controller
path: /v1.1/docs/user-guide/replication-controller.html path: /v1.1/docs/user-guide/replication-controller
- title: Services - title: Services
path: /v1.1/docs/user-guide/services.html path: /v1.1/docs/user-guide/services
- title: Volumes - title: Volumes
path: /v1.1/docs/user-guide/volumes.html path: /v1.1/docs/user-guide/volumes
- title: Persistent Volumes - title: Persistent Volumes
path: /v1.1/docs/user-guide/persistent-volumes.html path: /v1.1/docs/user-guide/persistent-volumes
- title: Secrets - title: Secrets
path: /v1.1/docs/user-guide/secrets.html path: /v1.1/docs/user-guide/secrets
- title: Names - title: Names
path: /v1.1/docs/user-guide/identifiers.html path: /v1.1/docs/user-guide/identifiers
- title: Namespaces - title: Namespaces
path: /v1.1/docs/user-guide/namespaces.html path: /v1.1/docs/user-guide/namespaces
- title: Service Accounts - title: Service Accounts
path: /v1.1/docs/user-guide/service-accounts.html path: /v1.1/docs/user-guide/service-accounts
- title: Annotations - title: Annotations
path: /v1.1/docs/user-guide/annotations.html path: /v1.1/docs/user-guide/annotations
- title: Daemon Sets - title: Daemon Sets
path: /v1.1/docs/admin/daemons.html path: /v1.1/docs/admin/daemons
- title: Deployments - title: Deployments
path: /v1.1/docs/user-guide/deployments.html path: /v1.1/docs/user-guide/deployments
- title: Ingress Resources - title: Ingress Resources
path: /v1.1/docs/user-guide/ingress.html path: /v1.1/docs/user-guide/ingress
- title: Horizontal Pod Autoscaling - title: Horizontal Pod Autoscaling
path: /v1.1/docs/user-guide/horizontal-pod-autoscaler.html path: /v1.1/docs/user-guide/horizontal-pod-autoscaler
- title: Jobs - title: Jobs
path: /v1.1/docs/user-guide/jobs.html path: /v1.1/docs/user-guide/jobs
- title: Resource Quotas - title: Resource Quotas
path: /v1.1/docs/admin/resource-quota.html path: /v1.1/docs/admin/resource-quota
- title: Kubernetes Design Docs - title: Kubernetes Design Docs
section: section:
- title: Kubernetes Architecture - title: Kubernetes Architecture
path: /v1.1/docs/design/architecture.html path: /v1.1/docs/design/architecture
- title: Kubernetes Design Overview - title: Kubernetes Design Overview
path: /v1.1/docs/design/README.html path: /v1.1/docs/design/README
- title: Security in Kubernetes - title: Security in Kubernetes
path: /v1.1/docs/design/security.html path: /v1.1/docs/design/security
- title: Kubernetes Identity and Access Management - title: Kubernetes Identity and Access Management
path: /v1.1/docs/design/access.html path: /v1.1/docs/design/access
- title: Security Contexts - title: Security Contexts
path: /v1.1/docs/design/security_context.html path: /v1.1/docs/design/security_context
- title: Kubernetes OpenVSwitch GRE/VxLAN networking - title: Kubernetes OpenVSwitch GRE/VxLAN networking
path: /v1.1/docs/admin/ovs-networking.html path: /v1.1/docs/admin/ovs-networking
+19 -19
View File
@@ -5,46 +5,46 @@ toc:
path: /v1.1/samples path: /v1.1/samples
section: section:
- title: Apache Cassandra Database - title: Apache Cassandra Database
path: /v1.1/examples/cassandra/README.html path: /v1.1/examples/cassandra/README
- title: Apache Spark - title: Apache Spark
path: /v1.1/examples/spark/README.html path: /v1.1/examples/spark/README
- title: Apache Storm - title: Apache Storm
path: /v1.1/examples/storm/README.html path: /v1.1/examples/storm/README
- title: Distributed Task Queue - title: Distributed Task Queue
path: /v1.1/examples/celery-rabbitmq/README.html path: /v1.1/examples/celery-rabbitmq/README
- title: Hazelcast - title: Hazelcast
path: /v1.1/examples/hazelcast/README.html path: /v1.1/examples/hazelcast/README
- title: Meteor Applications - title: Meteor Applications
path: /v1.1/examples/meteor/README.html path: /v1.1/examples/meteor/README
- title: Redis - title: Redis
path: /v1.1/examples/redis/README.html path: /v1.1/examples/redis/README
- title: RethinkDB - title: RethinkDB
path: /v1.1/examples/rethinkdb/README.html path: /v1.1/examples/rethinkdb/README
- title: Elasticsearch/Kibana Logging Demonstration - title: Elasticsearch/Kibana Logging Demonstration
path: /v1.1/docs/user-guide/logging-demo/README.html path: /v1.1/docs/user-guide/logging-demo/README
- title: Elasticsearch - title: Elasticsearch
path: /v1.1/examples/elasticsearch/README.html path: /v1.1/examples/elasticsearch/README
- title: OpenShift Origin - title: OpenShift Origin
path: /v1.1/examples/openshift-origin/README.html path: /v1.1/examples/openshift-origin/README
- title: Ceph - title: Ceph
path: /v1.1/examples/rbd/README.html path: /v1.1/examples/rbd/README
- title: Persistent Volume Samples - title: Persistent Volume Samples
section: section:
- title: WordPress on a Kubernetes Persistent Volume - title: WordPress on a Kubernetes Persistent Volume
path: /v1.1/examples/mysql-wordpress-pd/README.html path: /v1.1/examples/mysql-wordpress-pd/README
- title: GlusterFS - title: GlusterFS
path: /v1.1/examples/glusterfs/README.html path: /v1.1/examples/glusterfs/README
- title: iSCSI - title: iSCSI
path: /v1.1/examples/iscsi/README.html path: /v1.1/examples/iscsi/README
- title: NFS - title: NFS
path: /v1.1/examples/nfs/README.html path: /v1.1/examples/nfs/README
- title: Multi-tier Application Samples - title: Multi-tier Application Samples
section: section:
- title: Guestbook - Go Server - title: Guestbook - Go Server
path: /v1.1/examples/guestbook-go/README.html path: /v1.1/examples/guestbook-go/README
- title: GuestBook - PHP Server - title: GuestBook - PHP Server
path: /v1.1/examples/guestbook/README.html path: /v1.1/examples/guestbook/README
- title: MySQL - Phabricator Server - title: MySQL - Phabricator Server
path: /v1.1/examples/phabricator/README.html path: /v1.1/examples/phabricator/README