diff --git a/_data/tasks.yml b/_data/tasks.yml
index c720dfb09b..277efa4886 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -15,7 +15,7 @@ toc:
   - title: Configuring a Pod to Use a Volume for Storage
     path: /docs/tasks/configure-pod-container/configure-volume-storage/
   - title: Distributing Credentials Securely
-    path: /docs/tasks/administer-cluster/distribute-credentials-secure/
+    path: /docs/tasks/configure-pod-container/distribute-credentials-secure/
 
 - title: Accessing Applications in a Cluster
   section:
@@ -36,6 +36,7 @@ toc:
   section:
   - title: Assigning Pods to Nodes
     path: /docs/tasks/administer-cluster/assign-pods-nodes/
+
   - title: Autoscaling the DNS Service in a Cluster
     path: /docs/tasks/administer-cluster/dns-horizontal-autoscaling/
   - title: Safely Draining a Node while Respecting Application SLOs
diff --git a/docs/tasks/administer-cluster/distribute-credentials-secure.md b/docs/tasks/configure-pod-container/distribute-credentials-secure.md
similarity index 58%
rename from docs/tasks/administer-cluster/distribute-credentials-secure.md
rename to docs/tasks/configure-pod-container/distribute-credentials-secure.md
index 017b6aa459..c2828315cb 100644
--- a/docs/tasks/administer-cluster/distribute-credentials-secure.md
+++ b/docs/tasks/configure-pod-container/distribute-credentials-secure.md
@@ -2,7 +2,8 @@
 ---
 
 {% capture overview %}
-This page shows how to create a Secret and a Pod that has access to the Secret.
+This page shows how to securely inject sensitive data, such as passwords and
+encryption keys, into Pods.
 {% endcapture %}
 
 {% capture prerequisites %}
@@ -37,6 +38,11 @@ username and password:
 
         kubectl create -f http://k8s.io/docs/tasks/administer-cluster/secret.yaml
 
+    **Note:** If you want to skip the Base64 encoding step, you can create a Secret
+    by using the `kubectl create secret` command:
+
+        kubectl create secret generic test-secret --from-literal=username="my-app",password="39528$vdg7Jb"
+
 1. View information about the Secret:
 
         kubectl get secret test-secret
@@ -65,7 +71,7 @@ username and password:
         password:   13 bytes
         username:   7 bytes
 
-### Creating a Pod that has access to the secret data
+### Creating a Pod that has access to the secret data through a Volume
 
 Here is a configuration file you can use to create a Pod:
 
@@ -77,7 +83,7 @@ Here is a configuration file you can use to create a Pod:
 
 1. Verify that your Pod is running:
 
-        kubectl get pods
+        kubectl get pod secret-test-pod
 
     Output:
 
@@ -89,7 +95,9 @@ Here is a configuration file you can use to create a Pod:
 
         kubectl exec -it secret-test-pod -- /bin/bash
 
-1. In your shell, go to the directory where the secret data is exposed:
+1. The secret data is exposed to the Container through a Volume mounted under
+`/etc/secret-volume`. In your shell, go to the directory where the secret data
+is exposed:
 
         root@secret-test-pod:/# cd /etc/secret-volume
 
@@ -110,12 +118,52 @@ Here is a configuration file you can use to create a Pod:
         my-app
         39528$vdg7Jb
 
+### Creating a Pod that has access to the secret data through environment variables
+
+Here is a configuration file you can use to create a Pod:
+
+{% include code.html language="yaml" file="secret-envars-pod.yaml" ghlink="/docs/tasks/administer-cluster/secret-envars-pod.yaml" %}
+
+1. Create the Pod:
+
+        kubectl create -f http://k8s.io/docs/tasks/administer-cluster/secret-envars-pod.yaml
+
+1. Verify that your Pod is running:
+
+        kubectl get pod secret-envars-test-pod
+
+    Output:
+
+        NAME                     READY     STATUS    RESTARTS   AGE
+        secret-envars-test-pod   1/1       Running   0          4m
+
+1. Get a shell into the Container that is running in your Pod:
+
+        kubectl exec -it secret-envars-test-pod -- /bin/bash
+
+1. In your shell, display the environment variables:
+
+        root@secret-envars-test-pod:/# printenv
+
+    The output includes your username and password:
+
+        ...
+        SECRET_USERNAME=my-app
+        ...
+        SECRET_PASSWORD=39528$vdg7Jb
+
 {% endcapture %}
 
 {% capture whatsnext %}
 
-* Learn more about [secrets](/docs/user-guide/secrets/).
-* See [Secret](docs/api-reference/v1/definitions/#_v1_secret).
+* Learn more about [Secrets](/docs/user-guide/secrets/).
+* Learn about [Volumes](/docs/user-guide/volumes/).
+
+#### Reference
+
+* [Secret](docs/api-reference/v1/definitions/#_v1_secret)
+* [Volume](docs/api-reference/v1/definitions/#_v1_volume)
+* [Pod](docs/api-reference/v1/definitions/#_v1_pod)
 
 {% endcapture %}
 
diff --git a/docs/tasks/configure-pod-container/secret-envars-pod.yaml b/docs/tasks/configure-pod-container/secret-envars-pod.yaml
new file mode 100644
index 0000000000..1637c0eac3
--- /dev/null
+++ b/docs/tasks/configure-pod-container/secret-envars-pod.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: secret-envars-test-pod
+spec:
+  containers:
+  - name: envars-test-container
+    image: nginx
+    env:
+    - name: SECRET_USERNAME
+      valueFrom:
+        secretKeyRef:
+          name: test-secret
+          key: username
+    - name: SECRET_PASSWORD
+      valueFrom:
+        secretKeyRef:
+          name: test-secret
+          key: password
diff --git a/docs/tasks/administer-cluster/secret-pod.yaml b/docs/tasks/configure-pod-container/secret-pod.yaml
similarity index 82%
rename from docs/tasks/administer-cluster/secret-pod.yaml
rename to docs/tasks/configure-pod-container/secret-pod.yaml
index abbd6cb1d5..78633c477c 100644
--- a/docs/tasks/administer-cluster/secret-pod.yaml
+++ b/docs/tasks/configure-pod-container/secret-pod.yaml
@@ -10,6 +10,7 @@ spec:
           # name must match the volume name below
           - name: secret-volume
             mountPath: /etc/secret-volume
+  # The secret data is exposed to Containers in the Pod through a Volume.
   volumes:
     - name: secret-volume
       secret:
diff --git a/docs/tasks/administer-cluster/secret.yaml b/docs/tasks/configure-pod-container/secret.yaml
similarity index 100%
rename from docs/tasks/administer-cluster/secret.yaml
rename to docs/tasks/configure-pod-container/secret.yaml
diff --git a/docs/tasks/index.md b/docs/tasks/index.md
index 4daee756ca..6a2aaee6a4 100644
--- a/docs/tasks/index.md
+++ b/docs/tasks/index.md
@@ -10,6 +10,7 @@ single thing, typically by giving a short sequence of steps.
 * [Defining Environment Variables for a Container](/docs/tasks/configure-pod-container/define-environment-variable-container/)
 * [Defining a Command and Arguments for a Container](/docs/tasks/configure-pod-container/define-command-argument-container/)
 * [Assigning CPU and RAM Resources to a Container](/docs/tasks/configure-pod-container/assign-cpu-ram-container/)
+* [Distributing Credentials Securely](/docs/tasks/configure-pod-container/distribute-credentials-secure/)
 
 #### Accessing Applications in a Cluster