re-organise the usage section & move missing topics to this section

Signed-off-by: Tim Ramlot <[email protected]>

content/docs/manifest.json

@@ -298,36 +298,58 @@
               "path": "/docs/usage/README.md"
             },
             {
-              "title": "Certificate Resources",
+              "title": "cm Certificate",
               "path": "/docs/usage/certificate.md"
             },
             {
-              "title": "Prometheus Metrics",
-              "path": "/docs/usage/prometheus-metrics.md"
+              "title": "cm CertificateRequest",
+              "path": "/docs/usage/certificaterequest.md"
             },
             {
-              "title": "Securing Ingress Resources",
+              "title": "k8s Ingress",
               "path": "/docs/usage/ingress.md"
             },
             {
-              "title": "Securing Gateway Resources",
+              "title": "k8s Gateway",
               "path": "/docs/usage/gateway.md"
             },
             {
-              "title": "Securing Istio Service Mesh",
-              "path": "/docs/usage/istio.md"
+              "title": "k8s CertificateSigningRequests",
+              "path": "/docs/usage/kube-csr.md"
             },
             {
-              "title": "CSI Driver",
-              "path": "/docs/usage/csi.md"
+              "title": "Service Mesh",
+              "routes": [
+                {
+                  "title": "istio-csr",
+                  "path": "/docs/usage/istio-csr.md"
+                }
+              ]
             },
             {
-              "title": "Kubernetes CertificateSigningRequests",
-              "path": "/docs/usage/kube-csr.md"
+              "title": "CSI Driver",
+              "routes": [
+                {
+                  "title": "Introduction",
+                  "path": "/docs/usage/csi.md"
+                },
+                {
+                  "title": "csi-driver",
+                  "path": "/docs/usage/csi-driver.md"
+                },
+                {
+                  "title": "csi-driver-spiffe",
+                  "path": "/docs/usage/csi-driver-spiffe.md"
+                }
+              ]
             },
             {
               "title": "Policy for cert-manager certificates",
               "path": "/docs/usage/approver-policy.md"
+            },
+            {
+              "title": "Prometheus Metrics",
+              "path": "/docs/usage/prometheus-metrics.md"
             }
           ]
         },
@@ -338,18 +360,6 @@
               "title": "Contents",
               "path": "/docs/projects/README.md"
             },
-            {
-              "title": "istio-csr",
-              "path": "/docs/projects/istio-csr.md"
-            },
-            {
-              "title": "csi-driver",
-              "path": "/docs/projects/csi-driver.md"
-            },
-            {
-              "title": "csi-driver-spiffe",
-              "path": "/docs/projects/csi-driver-spiffe.md"
-            },
             {
               "title": "approver-policy",
               "routes": [
@@ -695,10 +705,6 @@
               "title": "Certificate",
               "path": "/docs/concepts/certificate.md"
             },
-            {
-              "title": "CertificateRequest",
-              "path": "/docs/concepts/certificaterequest.md"
-            },
             {
               "title": "ACME Orders and Challenges",
               "path": "/docs/concepts/acme-orders-challenges.md"

content/docs/usage/certificate.md

@@ -1,5 +1,5 @@
 ---
-title: Certificate Resources
+title: cert-manager.io Certificate
 description: 'cert-manager usage: Certificates'
 ---
 

content/docs/concepts/certificaterequest.md → content/docs/usage/certificaterequest.md

@@ -1,5 +1,5 @@
 ---
-title: CertificateRequest
+title: cert-manager.io CertificateRequest
 description: 'cert-manager core concepts: CertificateRequests'
 ---
 

content/docs/usage/gateway.md

@@ -1,5 +1,5 @@
 ---
-title: Securing gateway.networking.k8s.io Gateway Resources
+title: Annotated gateway.networking.k8s.io Gateway
 description: 'cert-manager usage: Kubernetes Gateways'
 ---
 

content/docs/usage/ingress.md

@@ -1,5 +1,5 @@
 ---
-title: Securing Ingress Resources
+title: Annotated networking.k8s.io Ingress
 description: 'cert-manager usage: Kubernetes Ingress'
 ---
 

content/docs/projects/istio-csr.md → content/docs/usage/istio-csr.md

@@ -1,8 +1,13 @@
 ---
-title: istio-csr
-description: ''
+title: Securing Istio Service Mesh
+description: 'cert-manager usage: Istio and istio-csr'
 ---
 
+cert-manager can be integrated with [Istio](https://istio.io) using the project
+[istio-csr](https://github.com/cert-manager/istio-csr). istio-csr will deploy an
+agent that is responsible for receiving certificate signing requests for all
+members of the Istio mesh, and signing them through cert-manager.
+
 istio-csr is an agent that allows for [Istio](https://istio.io) workload and
 control plane components to be secured using
 [cert-manager](https://cert-manager.io).

content/docs/usage/kube-csr.md

@@ -1,5 +1,5 @@
 ---
-title: Kubernetes CertificateSigningRequests
+title: certificates.k8s.io CertificateSigningRequest
 description: 'cert-manager usage: Kubernetes CertificateSigningRequest resources'
 ---
 

public/_redirects

@@ -2,6 +2,12 @@
 https://netlify.cert-manager.io/* https://cert-manager.io/:splat 301!
 https://cert-manager.netlify.com/* https://cert-manager.io/:splat 301!
 
+# Integrating the project pages into the main website
+/docs/usage/istio/ /docs/usage/istio-csr/ 301!
+/docs/projects/istio-csr/ /docs/usage/istio-csr/ 301!
+/docs/projects/csi-driver/ /docs/usage/csi-driver/ 301!
+/docs/projects/csi-driver-spiffe/ /docs/usage/csi-driver-spiffe/ 301!
+
 # Redirect all next-docs on the main site to the release-next preview
 https://cert-manager.io/next-docs/* https://release-next--cert-manager-website.netlify.app/docs/:splat 301!