Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Remove self-referential link
  Add fibre channel volume explanation (#3967)

docs/concepts/storage/volumes.md

@@ -74,6 +74,7 @@ Kubernetes supports several types of Volumes:
    * `awsElasticBlockStore`
    * `nfs`
    * `iscsi`
+   * `fc (fibre channel)`
    * `flocker`
    * `glusterfs`
    * `rbd`
@@ -320,6 +321,19 @@ simultaneous writers allowed.
 
 See the [iSCSI example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/iscsi) for more details.
 
+### fc (fibre channel)
+
+An `fc` volume allows an existing fibre channel volume to be mounted into your pod.
+You can specify single or multiple target World Wide Names to the parameter
+targetWWNs in your volume configuration. If multiple WWNs are specified,
+targetWWNs expects that those WWNs form multipath connection.
+
+__Important: You must configure FC SAN Zoning to allocate and mask those
+LUNs (volumes) to the target WWNs beforehand so that Kubernetes hosts
+can access them__
+
+See the [FC example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/fibre_channel) for more details.
+
 ### flocker
 
 [Flocker](https://clusterhq.com/flocker) is an open-source clustered container data volume manager. It provides management

docs/tasks/run-application/run-stateless-application-deployment.md

@@ -146,8 +146,6 @@ added to Kubernetes, replicated applications were configured by using a
 
 * Learn more about [Deployment objects](/docs/concepts/workloads/controllers/deployment/).
 
-* Learn more about [Deploying applications](/docs/user-guide/deploying-applications/)
-
 {% endcapture %}
 
 {% include templates/tutorial.md %}