* 'master' of https://github.com/kubernetes/kubernetes.github.io: (87 commits)
fix envFrom in configmap
Add link to example for CRDs (#5641)
Fixed links to architecture.md and principles.md
Polish AppArmor tutorial
Remove dangling files related to apparmor
fix the typo of serviceaccount (#5533)
Correct setup link (#5634)
relink the persistent volume of petset (#5582)
Updates to case study landing page (#5629)
translate doc resource-quotas into chinese
minor encoding fix for CN page
fix typo
concepts-overview-components+abac-fix
concepts-overview-components-fix
Update links to avoid redirects. (#5627)
Update links to avoid redirects. (#5625)
Fix 404s. (#5624)
Fix 404s. (#5623)
Edits cpu-constraint-namespace.md
Fix index redirects (#5502)
...
# Conflicts:
# _redirects
# docs/concepts/storage/volumes.md
# docs/concepts/workloads/controllers/daemonset.md
# docs/concepts/workloads/controllers/petset.md
# docs/concepts/workloads/controllers/statefulset.md
# docs/tasks/run-application/run-single-instance-stateful-application.md
# docs/tutorials/stateful-application/zookeeper.md
these links don't go anywhere anymore (the respective pages must have been moved?), and are more of a distraction than adding any real value when reading that paragraph.
* Revert "Fix the doc example"
This reverts commit 2872def62b.
* Revert "add the set of sessionAffinity timeoutseconds (#5474)"
This reverts commit 657734de6f.
* Revert "pod-security-policy.md: fix broken link to PSP proposal."
This reverts commit 8db51e099f.
* Revert "fix typo"
This reverts commit 24e5383071.
* Revert "Update images.md"
This reverts commit f844a41502.
* Revert "Update links to avoid redirects. (#5614)"
This reverts commit 35c7393849.
* Revamped concepts doc for ReplicaSet
* Minor changes to call out specific versions for selector defaulting and
immutability
* Addressed doc review comments
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14
ZTE-SH-CN-define-command-argument-container (#5381)
Update index.md
Update Kompose docs
Improve host aliases page (#5443)
Add link to AlwaysPullImages admission controller
Revert "create homepage for user journeys"
create homepage for user journeys
fix the command output
ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363)
Add a note to static pod manifest scanning
revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461)
Fix pod probes yaml file
Redirect v1 docs. (#5460)
Fix error link (#5459)
Fix typo in deployment documentation
# Conflicts:
# docs/tutorials/stateful-application/basic-stateful-set.md
- Fixes an inaccuracy: `template: metadata: labels:` labels the Pod template rather than the containers
- Elaborates some more on the explanation of the manifest
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (23 commits)
concepts/configuration/manage-compute-resources-container.md: fix a conversion (#4952)
Update authentication.md (#5281)
Update static-pod.md for consistency
Space needed before list in kramdown.
Update downward-api-volume-expose-pod-information.md
fix the command output
fix the command output
fix the command output
fix the command output
fix the command output
Fix CRD page typo
fix 404 page
Update binary_release.md
Update disruptions.md
fix the command output
fix typo
fix the command output
Fix curl does not work in zsh
use the term 'node' for consistency
fix typo
...
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
Update photon-controller.md (#5279)
add back Zach and Steve to PR assignment
fix the command output
Update troubleshooting.md
Update guaranteed-scheduling-critical-addon-pods.md
Include filename fix (#5139)
k8s-tutorials-stateful-application (#5112)
Update gce.md (#5163)
Update stage-documentation-changes.md (#5213)
fix the command output
Fix token-authentication-file internal link
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (32 commits)
Fixed broken link to Pods concept documentation (#5223)
Update some docs in /cn/docs (#4842)
Update deployment.md
fix the command output
Translate into chinese about NetworkPolicy
rootsongjc-pr-20170815
fix typo
fix the command output
Translate into chinese about GPU
index-pr-2017-08-15
Example links use kubernetes/examples
Make caret for version drop-down more visible
fix typo:ConfigMap
fix the command output
Fixed incorrect links for YAML files
Clean up the index page.
Remove broken link.
Update pod names to match what's in the spec.
Update daemonset.md
Update configure-aggregation-layer.md
...
steveperry-53