Merge remote-tracking branch 'origin/master'

2016-09-26 12:08:00 -07:00
parent a050ee1a78 e51b0a40bc
commit d56985239b
5 changed files with 12 additions and 4 deletions
@@ -250,8 +250,18 @@ toc:

 - title: Federation
  section:
-  - title: User guide
+  - title: Federation User Guide
    path: /docs/user-guide/federation/
+  - title: Federated Events
+    path: /docs/user-guide/federation/events/
+  - title: Federated Ingress
+    path: /docs/user-guide/federation/federated-ingress/
+  - title: Federated Namespaces
+    path: /docs/user-guide/federation/namespaces/
+  - title: Federated ReplicaSets
+    path: /docs/user-guide/federation/replicasets/
+  - title: Federated Secrets
+    path: /docs/user-guide/federation/secrets/
  - title: Federation API
    path: /docs/federation/api-reference/README/
  - title: Federation Components
@@ -37,6 +37,7 @@ resources.
 The following guides explain some of the resources in detail:

 * [Events](/docs/user-guide/federation/events/)
+* [Ingress](/docs/user-guide/federation/federated-ingress/)
 * [Namespaces](/docs/user-guide/federation/namespaces/)
 * [ReplicaSets](/docs/user-guide/federation/replicasets/)
 * [Secrets](/docs/user-guide/federation/secrets/)
@@ -3,7 +3,6 @@

 This guide explains how to use namespaces in Federation control plane.

-
 * TOC
 {:toc}

@@ -3,7 +3,6 @@

 This guide explains how to use replica sets in the Federation control plane.

-
 * TOC
 {:toc}

@@ -3,7 +3,6 @@

 This guide explains how to use secrets in Federation control plane.

-
 * TOC
 {:toc}