Merge branch 'master' into patch-2

2016-12-06 17:21:53 -08:00
parent f0d9f0d7ec 2c2bb312a6
commit 54f85d8aee
23 changed files with 94 additions and 73 deletions
@@ -14,20 +14,31 @@ docs, follow the instructions on

 {% capture body %}

-## Documentation formatting standards
+### Documentation formatting standards

-### Capitalize API objects
+#### Use Camel Case for API objects

-Capitalize the names of API objects. Refer to API objects without saying
-"object."
+When you refer to an API object, use the same uppercase and lowercase letters
+that are used in the actual object name. Typically, the names of API
+objects use
+[camel case](https://en.wikipedia.org/wiki/Camel_case).
+
+Don't split the API object name into separate words. For example, use
+PodTemplateList, not Pod Template List.
+
+Refer to API objects without saying "object," unless omitting "object"
+leads to an awkward construction.

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
  <tr><td>The Pod has two Containers.</td><td>The pod has two containers.</td></tr>
  <tr><td>The Deployment is responsible for ...</td><td>The Deployment object is responsible for ...</td></tr>
+  <tr><td>A PodList is a list of Pods.</td><td>A Pod List is a list of pods.</td></tr>
+  <tr><td>The two ContainerPorts ...</td><td>The two ContainerPort objects ...</td></tr>
+  <tr><td>The two ContainerStateTerminated objects ...</td><td>The two ContainerStateTerminateds ...</td></tr>
 </table>

-### Use angle brackets for placeholders
+#### Use angle brackets for placeholders

 Use angle brackets for placeholders. Tell the reader what a placeholder
 represents.
@@ -38,7 +49,7 @@ represents.

    where `<pod-name>` is the name of one of your pods.

-### Use bold for user interface elements
+#### Use bold for user interface elements

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -46,7 +57,7 @@ represents.
  <tr><td>Select <b>Other</b>.</td><td>Select 'Other'.</td></tr>
 </table>

-### Use italics to define or introduce new terms
+#### Use italics to define or introduce new terms

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -54,7 +65,7 @@ represents.
  <tr><td>These components form the <i>control plane.</i></td><td>These components form the <b>control plane.</b></td></tr>
 </table>

-### Use code style for filenames, directories, and paths
+#### Use code style for filenames, directories, and paths

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -63,9 +74,9 @@ represents.
  <tr><td>Open the <code>/_data/concepts.yaml</code> file.</td><td>Open the /_data/concepts.yaml file.</td></tr>
 </table>

-## Code snippet formatting
+### Code snippet formatting

-### Use code style for inline code and commands
+#### Use code style for inline code and commands

 For inline code in an HTML document, use the `<code>` tag. In a Markdown
 document, use the backtick (`).
@@ -76,14 +87,14 @@ document, use the backtick (`).
  <tr><td>The <code>kubectl run</code> command creates a Deployment.</td><td>The "kubectl run" command creates a Deployment.</td></tr>
 </table>

-### Don't include the command prompt
+#### Don't include the command prompt

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
  <tr><td>kubectl get pods</td><td>$ kubectl get pods</td></tr>
 </table>

-### Separate commands from output
+#### Separate commands from output

 Verify that the pod is running on your chosen node:

@@ -105,11 +116,11 @@ A list of Kubernetes-specific terms and words to be used consistently across the
 </table>{% endcomment %}


-## Content best practices
+### Content best practices

 This section contains suggested best practices for clear, concise, and consistent content.

-### Use present tense
+#### Use present tense

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -119,7 +130,7 @@ This section contains suggested best practices for clear, concise, and consisten
 Exception: Use future or past tense if it is required to convey the correct
 meaning.

-### Use active voice
+#### Use active voice

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -129,7 +140,7 @@ meaning.

 Exception: Use passive voice if active voice leads to an awkward construction.

-### Use simple and direct language
+#### Use simple and direct language

 Use simple and direct language. Avoid using unnecessary phrases, such as saying "please."

@@ -141,7 +152,7 @@ Use simple and direct language. Avoid using unnecessary phrases, such as saying

 </table>

-### Address the reader as "you"
+#### Address the reader as "you"

 <table>
  <tr><th>Do</th><th>Don't</th></tr>
@@ -149,9 +160,9 @@ Use simple and direct language. Avoid using unnecessary phrases, such as saying
    <tr><td>In the preceding output, you can see...</td><td>In the preceding output, we can see ...</td></tr>
 </table>

-## Patterns to avoid
+### Patterns to avoid

-### Avoid using "we"
+#### Avoid using "we"

 Using "we" in a sentence can be confusing, because the reader might not know
 whether they're part of the "we" you're describing.
@@ -163,7 +174,7 @@ whether they're part of the "we" you're describing.
  <tr><td>This page teaches you how to use pods.</td><td>In this page, we are going to learn about pods.</td></tr>
 </table>

-### Avoid jargon and idioms
+#### Avoid jargon and idioms

 Some readers speak English as a second language. Avoid jargon and idioms to help make their understanding easier.

@@ -173,13 +184,13 @@ Some readers speak English as a second language. Avoid jargon and idioms to help
    <tr><td>Create a new cluster.</td><td>Turn up a new cluster.</td></tr>
 </table>

-### Avoid statements about the future
+#### Avoid statements about the future

 Avoid making promises or giving hints about the future. If you need to talk about
 an alpha feature, put the text under a heading that identifies it as alpha
 information.

-### Avoid statements that will soon be out of date
+#### Avoid statements that will soon be out of date

 Avoid words like "currently" and "new." A feature that is new today might not be
 considered new in a few months.
@@ -27,7 +27,7 @@ a Kubernetes cluster from scratch.

 ### Local-machine Solutions

-[Minikube](/docs/getting-started-guides/minikube/) is the recommended method for you to create a single node kubernetes cluster locally for purposes of development and testing. Setup is completely automated and doesn't require a cloud provider account.  
+[Minikube](/docs/getting-started-guides/minikube/) is the recommended method for you to create a single node kubernetes cluster locally for purposes of development and testing. Setup is completely automated and doesn't require a cloud provider account.

 Use the [Minikube getting started guide](/docs/getting-started-guides/minikube/) to try it out.

@@ -45,6 +45,8 @@ clusters.

 [Platform9](https://platform9.com/products/kubernetes/) offers managed Kubernetes on-premises or any public cloud, and provides 24/7 health monitoring and alerting.

+[OpenShift Dedicated](https://www.openshift.com/dedicated/) offers managed Kubernetes clusters powered by OpenShift and [OpenShift Online](https://www.openshift.com/features/) provides free hosted access for Kubernetes applications.
+
 ### Turn-key Cloud Solutions

 These solutions allow you to create Kubernetes clusters on a range of Cloud IaaS providers with only a
@@ -25,8 +25,7 @@ for database debugging.

 1. Create a pod:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/access-application-cluster/redis-master.yaml
+        kubectl create -f http://k8s.io/docs/tasks/access-application-cluster/redis-master.yaml

    The output of a successful command verifies that the pod was created:

@@ -59,8 +59,7 @@ a `disktype=ssd` label.
 1. Use the configuration file to create a pod that will get scheduled on your
   chosen node:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/administer-cluster/pod.yaml
+        kubectl create -f http://k8s.io/docs/tasks/administer-cluster/pod.yaml

 1. Verify that the pod is running on your chosen node:

@@ -43,8 +43,7 @@ for the `Pod`:

 1. Create a Pod based on the YAML configuration file:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/cpu-ram.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/cpu-ram.yaml

 1. Display information about the pod:

@@ -39,8 +39,7 @@ file for the Pod defines a command and two arguments:

 1. Create a Pod based on the YAML configuration file:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/commands.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/commands.yaml

 1. List the running Pods:

@@ -33,8 +33,7 @@ Pod:

 1. Create a Pod based on the YAML configuration file:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/configure-pod-container/envars.yaml
+        kubectl create -f http://k8s.io/docs/tasks/configure-pod-container/envars.yaml

 1. List the running Pods:

@@ -32,12 +32,11 @@ In this exercise, you create a Pod that runs one container.
 The configuration file specifies a command that runs when
 the container starts.

-{% include code.html language="yaml" file="termination.yaml" ghlink="/docs/tasks/debug-pod-container/termination.yaml" %}
+{% include code.html language="yaml" file="termination.yaml" ghlink="/docs/tasks/debug-application-cluster/termination.yaml" %}

 1. Create a Pod based on the YAML configuration file:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tasks/debug-pod-container/termination.yaml
+        kubectl create -f http://k8s.io/docs/tasks/debug-application-cluster/termination.yaml

    In the YAML file, in the `cmd` and `args` fields, you can see that the
    container sleeps for 10 seconds and then writes "Sleep expired" to
@@ -70,7 +69,7 @@ the container starts.

 1. Use a Go template to filter the output so that it includes
 only the termination message:
-        
+
 ```
 {% raw %}    kubectl get pod termination-demo -o go-template="{{range .status.containerStatuses}}{{.lastState.terminated.message}}{{end}}"{% endraw %}
 ```
@@ -99,7 +98,7 @@ Set `terminationMessagePath` as shown here:

 {% capture whatsnext %}

-* See the `terminationMessagePath` field in 
+* See the `terminationMessagePath` field in
  [Container](/docs/api-reference/v1/definitions#_v1_container).
 * Learn about [retrieving logs](/docs/user-guide/logging/).
 * Learn about [Go templates](https://golang.org/pkg/text/template/).
@@ -59,6 +59,13 @@ interest. For example, people new to Kubernetes may also want to join the
 `#kubernetes-novice` channel. As another example, developers should join the
 `#kubernetes-dev` channel.

+There are also many country specific/local language channels. Feel free to join
+these channels for localized support and info:
+
+- France: `#fr-users`, `#fr-events`
+- Germany: `#de-users`, `#de-events`
+- Japan: `#jp-users`, `#jp-events`
+
 ### Mailing List

 The Kubernetes / Google Container Engine mailing list is [kubernetes-users@googlegroups.com](https://groups.google.com/forum/#!forum/kubernetes-users)
@@ -72,7 +72,7 @@ redirect_from:

 		<div class="row">
 			<div class="col-md-8">
-				<p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activity in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p>
+				<p><b>The Master is responsible for managing the cluster.</b> The master coordinates all activities in your cluster, such as scheduling applications, maintaining applications' desired state, scaling applications, and rolling out new updates.</p>
 				<p><b>A node is a VM or a physical computer that serves as a worker machine in a Kubernetes cluster.</b> Each node has a Kubelet, which is an agent for managing the node and communicating with the Kubernetes master. The node should also have tools for handling container operations, such as Docker or rkt. A Kubernetes cluster that handles production traffic should have a minimum of three nodes.</p>

 			</div>
@@ -87,7 +87,7 @@ redirect_from:
 			<div class="col-md-8">
 				<p>When you deploy applications on Kubernetes, you tell the master to start the application containers. The master schedules the containers to run on the cluster's nodes. <b>The nodes communicate with the master using the Kubernetes API</b>, which the master exposes. End users can also use the Kubernetes API directly to interact with the cluster.</p>

-				<p>A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use <a href="https://github.com/kubernetes/minikube">minikube</a>.  Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS  and Windows systems. The minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with minikube pre-installed.</p>
+				<p>A Kubernetes cluster can be deployed on either physical or virtual machines. To get started with Kubernetes development, you can use <a href="https://github.com/kubernetes/minikube">Minikube</a>.  Minikube is a lightweight Kubernetes implementation that creates a VM on your local machine and deploys a simple cluster containing only one node. Minikube is available for Linux, Mac OS  and Windows systems. The Minikube CLI provides basic bootstrapping operations for working with your cluster, including start, stop, status, and delete. For this bootcamp, however, you'll use a provided online terminal with Minikube pre-installed.</p>

 				<p>Now that you know what Kubernetes is, let’s go to the online tutorial and start our first cluster!</p>

@@ -70,7 +70,7 @@

                <p>You can create and manage a Deployment by using the Kubernetes command line interface, <b>Kubectl</b>. Kubectl uses the Kubernetes API to interact with the cluster. In this module, you'll learn the most common Kubectl commands needed to create Deployments that run your applications on a Kubernetes cluster.</p>

-				<p>When you create a Deployment, you'll need to specify the container image for your application and the number of replicas that you want to run. You can change that information later by updating your Deployment; Modules <a href="5-0.html">5</a> and <a href="5-0.html">6</a> of the bootcamp discuss how you can update your Deployments.</p>
+				<p>When you create a Deployment, you'll need to specify the container image for your application and the number of replicas that you want to run. You can change that information later by updating your Deployment; Modules <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> and <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> of the bootcamp discuss how you can scale and update your Deployments.</p>



@@ -85,7 +85,7 @@

 		<div class="row">
 			<div class="col-md-8">
-				<p>For our first Deployment, we’ll use a <a href="https://nodejs.org">NodeJS</a> application packaged in a Docker container. The source code and the Dockerfile are available in the <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub repository</a> for the Kubernetes Bootcamp.</p>
+				<p>For our first Deployment, we’ll use a <a href="https://nodejs.org">Node.js</a> application packaged in a Docker container. The source code and the Dockerfile are available in the <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub repository</a> for the Kubernetes Bootcamp.</p>

 				<p>Now that you know what Deployments are, let’s go to the online tutorial and deploy our first app!</p>

@@ -27,7 +27,7 @@

 			<div class="col-md-8">
 				<h2>Kubernetes Pods</h2>
-				<p>When you created a Deployment in Module <a href="/docs/tutorials/kubernetes-basics/deploy-app.html">2</a>, Kubernetes created a <b>Pod</b> to host your application instance. A Pod is Kubernetes abstraction that represents a group of one or more application containers (such as Docker or rkt), and some shared resources for those containers. Those resources include:</p>
+				<p>When you created a Deployment in Module <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>, Kubernetes created a <b>Pod</b> to host your application instance. A Pod is Kubernetes abstraction that represents a group of one or more application containers (such as Docker or rkt), and some shared resources for those containers. Those resources include:</p>
 				<ul>
 					<li>Shared storage, as Volumes</li>
 					<li>Networking, as a unique cluster IP address</li>
@@ -106,7 +106,7 @@
 		<div class="row">
 			<div class="col-md-8">
 				<h2>Troubleshooting with kubectl</h2>
-				<p>In Module <a href="2-0.html">2</a>, you used Kubectl command-line interface. You'll continue to use it in Module 3 to get information about deployed applications and their environments. The most common operations can be done with the following kubectl commands:</p>
+				<p>In Module <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>, you used Kubectl command-line interface. You'll continue to use it in Module 3 to get information about deployed applications and their environments. The most common operations can be done with the following kubectl commands:</p>
 				<ul>
 					<li><b>kubectl get</b> - list resources</li>
 					<li><b>kubectl describe</b> - show detailed information about a resource</li>
@@ -114,7 +114,7 @@
 					<li><b>kubectl exec</b> - execute a command on a container in a pod</li>
 				</ul>

-				<p>You can use these commands to see when applications were deployed, what their current status is, where they are running and what their configuration is.</p>
+				<p>You can use these commands to see when applications were deployed, what their current statuses are, where they are running and what their configurations are.</p>

 				<p>Now that we know more about our cluster components and the command line, let’s explore our application.</p>

@@ -71,7 +71,7 @@

 				<p>A Service provides load balancing of traffic across the contained set of Pods. This is useful when a service is created to group all Pods from a specific Deployment (our application will make use of this in the next module, when we’ll have multiple instances running).</p>

-				<p>Services are also responsible for service-discovery within the cluster (covered in Module 6). This will for example allow a frontend service (like a web server) to receive traffic from a backend service (like a database) without worrying about Pods.</p>
+				<p>Services are also responsible for service-discovery within the cluster (covered in <a href="/docs/user-guide/connecting-applications/#accessing-the-service">Accessing the Service</a>). This will for example allow a frontend service (like a web server) to receive traffic from a backend service (like a database) without worrying about Pods.</p>

 				<p>Services match a set of Pods using Label Selectors, a grouping primitive that allows logical operation on Labels.</p>

@@ -119,7 +119,7 @@
 				<p>Labels can be attached to objects at the creation time or later and can be modified at any time.
 				The kubectl run command sets some default Labels/Label Selectors on the new Pods/ Deployment. The link between Labels and Label Selectors defines the relationship between the Deployment and the Pods it creates.</p>

-				<p>Let’s expose now our application with the help of a Service, and apply some new Labels.</p>
+				<p>Now let’s expose our application with the help of a Service, and apply some new Labels.</p>
 			</div>
 		</div>
 		<br>
@@ -25,7 +25,7 @@
 			<div class="col-md-8">
       <h3>Scaling an application</h3>

-			<p>In the previous modules we created a <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>, and then exposed it publicly via a <a href="http://kubernetes.io/docs/user-guide/services/"> Service </a>. The Deployment created  only one Pod for running our application.  When traffic increases, we will need to scale the application to keep up with  user demand.</p>
+			<p>In the previous modules we created a <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>, and then exposed it publicly via a <a href="http://kubernetes.io/docs/user-guide/services/">Service</a>. The Deployment created only one Pod for running our application.  When traffic increases, we will need to scale the application to keep up with  user demand.</p>

 			<p><b>Scaling</b> is accomplished by changing the number of replicas in a Deployment</p>

@@ -25,10 +25,10 @@
 			<div class="col-md-8">
 			<h3>Updating an application</h3>

-			<p>Users expect applications to be available all the time and developers are expected to deploy new versions of them several times a day. In Kubernetes this is done with rolling updates. <b>Rolling updates</b> allows Deployments to occur with zero downtime by incrementally updating Pods instances with new ones. The new Pods will be scheduled on Nodes with available resources.</p>
+			<p>Users expect applications to be available all the time and developers are expected to deploy new versions of them several times a day. In Kubernetes this is done with rolling updates. <b>Rolling updates</b> allow Deployments' update to take place with zero downtime by incrementally updating Pods instances with new ones. The new Pods will be scheduled on Nodes with available resources.</p>

 			<p>In the previous module we scaled our application to run multiple instances. This is a requirement for performing updates without affecting application availability. By default, the maximum number of Pods that can be unavailable during the update and the maximum number of new Pods that can be created, is one. Both options can be configured to either numbers or percentages (of Pods).
-			In Kubernetes, updates are versioned and any Deployment update can be reverted to a previously (stable) version.</p>
+			In Kubernetes, updates are versioned and any Deployment update can be reverted to previous (stable) version.</p>

 			</div>
 			<div class="col-md-4">
@@ -39,7 +39,7 @@
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
-					<p><i>Rolling updates allows Deployments update with zero downtime by incrementally updating Pods instances with new ones. </i></p>
+					<p><i>Rolling updates allow Deployments' update to take place with zero downtime by incrementally updating Pods instances with new ones. </i></p>
 				</div>
 			</div>
 		</div>
@@ -103,7 +103,7 @@ provides load balancing for an application that has two running instances.

        curl http://<public-node-ip>:<node-port>

-    where `<public-node-ip>` us the public IP address of your node,
+    where `<public-node-ip>` is the public IP address of your node,
    and `<node-port>` is the NodePort value for your service.

    The response to a successful request is a hello message:
@@ -64,7 +64,7 @@ external IP address.
        NAME         CLUSTER-IP     EXTERNAL-IP      PORT(S)    AGE
        my-service   10.3.245.137   104.198.205.71   8080/TCP   54s

-    Note: If the external IP address is shown as <pending>, wait for a minute
+    Note: If the external IP address is shown as \<pending\>, wait for a minute
    and enter the same command again.

 1. Display detailed information about the Service:
@@ -110,7 +110,7 @@ external IP address.

        curl http://<external-ip>:<port>

-    where `<external-ip>` us the external IP address of your Service,
+    where `<external-ip>` is the external IP address of your Service,
    and `<port>` is the value of `Port` in your Service description.

    The response to a successful request is a hello message:
@@ -37,8 +37,7 @@ a Deployment that runs the nginx:1.7.9 Docker image:

 1. Create a Deployment based on the YAML file:

-        export REPO=https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master
-        kubectl create -f $REPO/docs/tutorials/stateless-application/deployment.yaml
+        kubectl create -f http://k8s.io/docs/tutorials/stateless-application/deployment.yaml

 1. Display information about the Deployment:

@@ -81,7 +80,7 @@ specifies that the deployment should be updated to use nginx 1.8.

 1. Apply the new YAML file:

-        kubectl apply -f $REPO/docs/tutorials/stateless-application/deployment-update.yaml
+        kubectl apply -f http://k8s.io/docs/tutorials/stateless-application/deployment-update.yaml

 1. Watch the deployment create pods with new names and delete the old pods:

@@ -97,7 +96,7 @@ should have four pods:

 1. Apply the new YAML file:

-        kubectl apply -f $REPO/docs/tutorials/stateless-application/deployment-scale.yaml
+        kubectl apply -f http://k8s.io/docs/tutorials/stateless-application/deployment-scale.yaml

 1. Verify that the Deployment has four pods:

@@ -14,8 +14,8 @@ should run in a container.  In this case, Kubernetes runs the image's default co
 to run a particular command or override the image's defaults, there are two additional fields that
 we can use:

-1.  `Command`: Controls the actual command run by the image
-2.  `Args`: Controls the arguments passed to the command
+1.  `command`: Controls the actual command run by the image
+2.  `args`: Controls the arguments passed to the command

 ### How docker handles command and arguments

@@ -28,20 +28,20 @@ fields as either a string array or a string and there are subtle differences in
 handled.  We encourage the curious to check out Docker's documentation for this feature.

 Kubernetes allows you to override both the image's default command (docker `Entrypoint`) and args
-(docker `Cmd`) with the `Command` and `Args` fields of `Container`.  The rules are:
+(docker `Cmd`) with the `command` and `args` fields of `container`.  The rules are:

-1.  If you do not supply a `Command` or `Args` for a container, the defaults defined by the image
-    will be used
-2.  If you supply a `Command` but no `Args` for a container, only the supplied `Command` will be
-    used; the image's default arguments are ignored
-3.  If you supply only `Args`, the image's default command will be used with the arguments you
-    supply
-4.  If you supply a `Command` **and** `Args`, the image's defaults will be ignored and the values
-    you supply will be used
+1.  If you do not supply a `command` or `args` for a container, the defaults defined by the image
+    will be used.
+2.  If you supply a `command` but no `args` for a container, only the supplied `command` will be
+    used; the image's default arguments are ignored.
+3.  If you supply only `args`, the image's default command will be used with the arguments you
+    supply.
+4.  If you supply a `command` **and** `args`, the image's defaults will be ignored and the values
+    you supply will be used.

 Here are examples for these rules in table format

-| Image `Entrypoint` |    Image `Cmd`   | Container `Command` |  Container `Args`  |    Command Run   |
+| Image `Entrypoint` |    Image `Cmd`   | Container `command` |  Container `args`  |    Command Run   |
 |--------------------|------------------|---------------------|--------------------|------------------|
 |     `[/ep-1]`      |   `[foo bar]`    |   &lt;not set&gt;   |   &lt;not set&gt;  | `[ep-1 foo bar]` |
 |     `[/ep-1]`      |   `[foo bar]`    |      `[/ep-2]`      |   &lt;not set&gt;  |     `[ep-2]`     |
@@ -50,7 +50,7 @@ a matching secret in all underlying kubernetes clusters.
 You can verify this by checking each of the underlying clusters, for example:

 ``` shell
-kubectl --context=gce-asia-east1a get rs myrs
+kubectl --context=gce-asia-east1a get secret mysecret
 ```

 The above assumes that you have a context named 'gce-asia-east1a'
@@ -77,7 +77,7 @@ the federation apiserver instead of sending it to a specific Kubernetes cluster.
 For example, you can do that using kubectl by running:

 ```shell
-kubectl --context=federation-cluster delete rs myrs
+kubectl --context=federation-cluster delete secret mysecret 
 ```

 Note that at this point, deleting a federated secret will not delete the
@@ -204,7 +204,7 @@ The status of the init containers is returned as another annotation - `pod.beta.

 Init containers support all of the same features as normal containers, including resource limits, volumes, and security settings. The resource requests and limits for an init container are handled slightly different than normal containers since init containers are run one at a time instead of all at once - any limits or quotas will be applied based on the largest init container resource quantity, rather than as the sum of quantities. Init containers do not support readiness probes since they will run to completion before the pod can be ready.

-[Complete Init Container Documentation](/docs/user-guide/pods/init-containers.md)
+[Complete Init Container Documentation](/docs/user-guide/pods/init-container/)


 ## Lifecycle hooks and termination notice