Merge branch 'master' into master

_data/reference.yml

@@ -219,7 +219,7 @@ toc:
   - title: Replication Controller
     path: /docs/user-guide/replication-controller/    
   - title: Resource Quotas
-    path: /docs/admin/resource-quota/    
+    path: /docs/admin/resourcequota/
   - title: Scheduled Jobs
     path: /docs/user-guide/scheduled-jobs/
   - title: Secrets
@@ -269,6 +269,6 @@ toc:
   - title: Federation Components
     section:
     - title: federation-apiserver
-      path: /docs/admin/federation-apiserver.md
+      path: /docs/admin/federation-apiserver
     - title : federation-controller-mananger
-      path: /docs/admin/federation-controller-manager.md
+      path: /docs/admin/federation-controller-manager

docs/user-guide/ingress.md

@@ -53,18 +53,18 @@ Make sure you review the [beta limitations](https://github.com/kubernetes/contri
 A minimal Ingress might look like:
 
 ```yaml
-01. apiVersion: extensions/v1beta1
+apiVersion: extensions/v1beta1
-02. kind: Ingress
+kind: Ingress
-03. metadata:
+metadata:
-04.  name: test-ingress
+  name: test-ingress
-05. spec:
+spec:
-06.  rules:
+  rules:
-07.  - http:
+  - http:
-08.      paths:
+      paths:
-09.      - path: /testpath
+      - path: /testpath
-10.        backend:
+        backend:
-11.          serviceName: test
+          serviceName: test
-12.          servicePort: 80
+          servicePort: 80
 ```
 
 *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).*