Merge branch 'master' into download_kubectl

2016-10-21 21:40:15 -04:00
parent 500aec5eed 2f7dcedbbb
commit 763b90e99a
45 changed files with 564 additions and 98 deletions
@@ -2,6 +2,12 @@ bigheader: "Tasks"
 toc:
 - title: Tasks
  path: /docs/tasks/
+- title: Configuring Pods and Containers
+  section:
+  - title: Defining Environment Variables for a Container
+    path: /docs/tasks/configure-pod-container/define-environment-variable-container/
+  - title: Defining a Command and Arguments for a Container
+    path: /docs/tasks/configure-pod-container/define-command-argument-container/
 - title: Accessing Applications in a Cluster
  section:
  - title: Using Port Forwarding to Access Applications in a Cluster