Update install topics

_data/home-content.yml

@@ -224,22 +224,17 @@
   links:
     - title: Installation environments
       localurl: /docs/installation/installation-options/
-    - title: Codefresh Runner CI/CD installation
+    - title: Codefresh Runner installation
       localurl: /docs/installation/codefresh-runner/ 
-    - title: On-Premises CI/CD installation
+    - title: On-Premises installation
       localurl: /docs/installation/codefresh-on-prem/
-    - title: On-Premises CI/CD upgrade
+    - title: On-Premises upgrade
       localurl: /docs/installation/codefresh-on-prem-upgrade/
-    - title: Hosted GitOps Runtime installation
-      localurl: /docs/installation/hosted-runtime/  
-    - title: Hybrid GitOps Runtime installation
-      localurl: /docs/installation/hybrid-gitops/  
-    - title: Monitoring & managing GitOps Runtimes
-      localurl: /docs/installation/monitor-manage-runtimes/
-    - title: Adding external clusters to GitOps Runtimes
-      localurl: /docs/installation/managed-cluster/
-    - title:  Adding Git Sources to GitOps Runtimes
-      localurl: /docs/installation/git-sources/
+    - title: Hosted GitOps installation
+      localurl: /docs/installation/gitops/hosted-runtime/  
+    - title: Hybrid GitOps installation
+      localurl: /docs/installation/gitops/hybrid-gitops/  
+
 
 
 - title: Administration

_data/nav.yml

@@ -481,26 +481,29 @@
 - title: Installation
   url: "/installation"
   pages:
-    - title: Installation environments
+    - title: Environments
       url: "/installation-options"
     - title: Runtime architectures
       url: "/runtime-architecture"
-    - title: Codefresh Runner installation
+    - title: Codefresh Runner
       url: "/codefresh-runner"
-    - title: Hosted GitOps Runtime installation
-      url: "/hosted-runtime" 
-    - title: Hybrid GitOps Runtime installation
-      url: "/hybrid-gitops"  
     - title: On-Premises installation
       url: "/codefresh-on-prem"
     - title: On-Premises upgrade
       url: "/codefresh-on-prem-upgrade"
-    - title: Monitoring & managing GitOps Runtimes
-      url: "/monitor-manage-runtimes"
-    - title: Add external clusters to GitOps Runtimes
-      url: "/managed-cluster" 
-    - title: Add Git Sources to to GitOps Runtimes
-      url: "/git-sources"
+    - title: GitOps
+      url: 
+      sub-pages:
+        - title: Hosted GitOps Runtime
+          url: "/hosted-runtime" 
+        - title: Hybrid GitOps Runtime
+          url: "/hybrid-gitops"  
+        - title: Monitoring & managing GitOps Runtimes
+          url: "/monitor-manage-runtimes"
+        - title: Add external clusters to GitOps Runtimes
+          url: "/managed-cluster" 
+        - title: Add Git Sources to to GitOps Runtimes
+          url: "/git-sources"
 
 
 - title: Administration

_docs/installation/upgrade-gitops-cli.md → _docs/clients/upgrade-gitops-cli.md

@@ -1,7 +1,8 @@
 ---
-title: "Download/upgrade Codefresh CLI"
-description: "Have the latest version of the Codefresh CLI for GitOps runtimes"
+title: "Download/upgrade GitOps CLI"
+description: "Have the latest version of the GitOps CLI"
 group: installation
+sub_group: gitops
 toc: true
 ---
 
@@ -11,7 +12,7 @@ When newer versions are available, the CLI automatically notifies you through a
 
 
 ## GitOps CLI installation modes
-The table lists the modes available to install the Codefresh CLI.
+The table lists the modes available to install the GitOps CLI.
 
 {: .table .table-bordered .table-hover}
 | Install mode | OS       | Commands |
@@ -23,7 +24,7 @@ The table lists the modes available to install the Codefresh CLI.
 | `brew` | N/A| `brew tap codefresh-io/cli && brew install cf2`|````
 
 ## Install the GitOps CLI
-Install the Codefresh CLI using the option that best suits you: `curl`, `brew`, or standard download.  
+Install the GitOps CLI using the option that best suits you: `curl`, `brew`, or standard download.  
 If you are not sure which OS to select for `curl`, simply select one, and Codefresh automatically identifies and selects the right OS for CLI installation.
 
 1. Do one of the following:
@@ -83,5 +84,5 @@ You can upgrade to a specific version if you so require, or download the latest
     * `<output-file>` is the path to the destination file, for example, `/cli-download`.
 
 ## Related articles
-[Hosted GitOps Runtime setup]({{site.baseurl}}/docs/installation/hosted-runtime)  
-[Hybrid GitOps Runtime installation]({{site.baseurl}}/docs/installation/hybrid-gitops)  
+[Hosted GitOps Runtime setup]({{site.baseurl}}/docs/installation/gitops/hosted-runtime)  
+[Hybrid GitOps Runtime installation]({{site.baseurl}}/docs/installation/gitops/hybrid-gitops)  

_docs/getting-started/concepts.md

@@ -18,8 +18,8 @@ A single Runtime can connect to and manage multiple remote clusters.
 
 See:  
 [GitOps runtime architecture]({{site.baseurl}}/docs/installation/runtime-architecture)  
-[Hybrid GitOps Runtime installation]({{site.baseurl}}/docs/installation/hybrid-gitops)  
-[Hosted GitOps Runtime installation]({{site.baseurl}}/docs/installation/hosted-runtime)
+[Hybrid GitOps Runtime installation]({{site.baseurl}}/docs/installation/gitops/hybrid-gitops)  
+[Hosted GitOps Runtime installation]({{site.baseurl}}/docs/installation/gitops/hosted-runtime)
 
 
 

_docs/installation/git-sources.md → _docs/installation/gitops/git-sources.md

@@ -1,19 +1,20 @@
 ---
 title: "Add Git Sources to GitOps Runtimes"
-description: ""
+description: "Manage Git Sources storing resources"
 group: installation
+sub_group: gitops
 toc: true
 ---
 
 
 A Git Source is the equivalent of an Argo CD application that tracks a Git repository and syncs the desired state of the repo to the destination K8s cluster. In addition to application resources, the Git Source can store resources for GitOps Runtimes, and CI/CD entities such as delivery pipelines, Workflow Templates, workflows, and applications.
 
-Provisioning a Runtime automatically creates a Git Source that stores resources for the Runtime and for the demo CI pipelines that are optionally installed with the Runtime. Every Git Source is associated with a Runtime. You can add Git Sources at any time, to the same or to different Runtimes.
+Provisioning a GitOps Runtime automatically creates a Git Source that stores resources for the Runtime and for the demo CI pipelines that are optionally installed with the Runtime. Every Git Source is associated with a GitOps Runtime. You can add more Git Sources at any time, to the same or to different Runtimes.
 
-Once you create a Git Source for a Runtime, you can store resources for CI/CD entities associated with it. For example, when creating pipelines or applications, you can select the Git Source to which to store manifest definitions.
+Once you create a Git Source for a GitOps Runtime, you can store resources for CI/CD entities associated with it. For example, when creating pipelines or applications, you can select the Git Source to which to store manifest definitions.
 
 
-### View Git Sources and definitions
+## View Git Sources and definitions
 Drill down on a runtime in List View to see its Git Sources. 
 
 1. In the Codefresh UI, go to the [GitOps Runtimes](https://g.codefresh.io/2.0/account-settings/runtimes){:target="\_blank"} page.
@@ -26,14 +27,14 @@ Drill down on a runtime in List View to see its Git Sources.
 	url="/images/runtime/git-source-list.png" 
 	alt="Git Sources in runtime" 
 	caption="Git Sources in runtime"
-    max-width="30%" 
+    max-width="60%" 
 %}
 
 {:start="3"}
 1. To go to the repo tracked by the Git Source, in the Repo column, mouse over the repo name and select **Go to Git repo**.
 1. To see the definitions for the Git Source, select the three dots at the end of the row.
 
-### Create a Git Source
+## Create a Git Source
 Create Git Sources for any provisioned Runtime.  The Git Sources are available to store resources for pipelines or applications when you create them. 
 
 >Make sure you are in the List View to create Git Sources. 
@@ -49,7 +50,7 @@ Create Git Sources for any provisioned Runtime.  The Git Sources are available t
 	url="/images/runtime/create-git-source.png" 
 	alt="Create Git Source" 
 	caption="Create Git Source"
-    max-width="30%" 
+    max-width="60%" 
 %}
 
   * **Git Source Name**: The name of the Git Source, which must be unique within the cluster.
@@ -69,7 +70,7 @@ Create Git Sources for any provisioned Runtime.  The Git Sources are available t
 {:start="4"}
 1. Select **+ Create Git Source**.
 
-### Edit Git Source definitions
+## Edit Git Source definitions
 Edit an existing Git Source by changing the source and destination definitions.  
 > You cannot change the name of the Git Source.
 
@@ -89,7 +90,7 @@ Edit an existing Git Source by changing the source and destination definitions.
 {:start="4"}
 1. Change the **Source** and **Destination** definitions for the Git Source, and select **Save**. 
 
-### View/download logs for a Git Source
+## View/download logs for a Git Source
 View online logs for any Git Source associated with a Runtime, and if needed, download the log file for offline viewing and analysis.
 Online logs show up to 1000 of the most recent events (lines), updated in real time. Downloaded logs include all the events, from the application launch to the date and time of download. 
 
@@ -104,7 +105,7 @@ Online logs show up to 1000 of the most recent events (lines), updated in real t
 	url="/images/runtime/git-source-view-logs.png" 
 	alt="Edit Git Source" 
 	caption="Edit Git Source"
-    max-width="30%" 
+    max-width="60%" 
 %}
 
 {:start="4"}
@@ -126,8 +127,8 @@ Online logs show up to 1000 of the most recent events (lines), updated in real t
 1. To download the log, click **Download**.  
   The file is downloaded with `.log` extension.
 
-### What to read next
-[Monitoring & managing GitOps Runtimes]({{site.baseurl}}/docs/installation/monitor-manage-runtimes/)
+## Related articles
+[Monitoring & managing GitOps Runtimes]({{site.baseurl}}/docs/installation/gitops/monitor-manage-runtimes/)  
 [Shared configuration repo]({{site.baseurl}}/docs/reference/shared-configuration)  
 
 

_docs/installation/hosted-runtime.md → _docs/installation/gitops/hosted-runtime.md

@@ -2,12 +2,13 @@
 title: "Hosted GitOps Runtime setup"
 description: "Provision Hosted GitOps environment"
 group: installation
+sub_group: gitops
 toc: true
 ---
 
 
 
-Set up your hosted environment with the Hosted GitOps Runtime to leverage extensive CD capabilities.
+Set up your environment with the Hosted GitOps Runtime to leverage extensive CD capabilities.
 <!---Read about [Hosted GitOps]({{site.baseurl}}/docs/incubation/intro-hosted-runtime/). -->
 
 ## System requirements for Hosted GitOps Runtimes
@@ -132,10 +133,10 @@ max-width="70%"
   where:  
   `hosted-codefresh` is the name of your Hosted GitOps Runtime, automatically assigned by Codefresh.
 1. In the Codefresh UI, return to Codefresh [Home](https://g.codefresh.io/2.0/?time=LAST_7_DAYS){:target="\_blank"}.
-1. Refresh the page and start with _1. Provision hosted runtime_ above.
+1. Refresh the page and start with [Step 1: Install Hosted GitOps Runtime](#step-1-install-hosted-gitops-runtime).
 
 
-### Step 2: Connect Git provider
+## Step 2: Connect Git provider
 Connect your Hosted GitOps Runtime to a Git provider for Codefresh to create the required Git repos.  First authorize access to your Git provider through an OAuth token, and then select the Git organizations or accounts in which to create the required Git repos.  
 
 >Only authorized organizations are displayed in the list. To authorize organizations for the Codefresh application in GitHub, see [Authorize organizations/projects]({{site.baseurl}}/docs/administration/hosted-authorize-orgs/).
@@ -240,10 +241,10 @@ max-width="80%"
 %}
 
 
-### 3. Connect a Kubernetes cluster
+## 3. Connect a Kubernetes cluster
 
 Connect a destination cluster to the Hosted GitOps Runtime and register it as a managed cluster. Deploy applications and configuration to the cluster.
-For managed cluster information and installing Argo Rollouts, see [Add and manage external clusters]({{site.baseurl}}/docs/runtime/managed-cluster/).
+For managed cluster information and installing Argo Rollouts, see [Add and manage external clusters]({{site.baseurl}}/docs/installation/gitops/managed-cluster/).
 
 
  {% include 
@@ -292,10 +293,7 @@ max-width="70%"
 1. Configure access to the IP addresses required. See [Codefresh IP addresses]({{site.baseurl}}/docs/administration/platform-ip-addresses/). 
 
 If you could not connect a cluster, you may not have the latest version of the CLI:  
-* If you have installed the Codefresh CLI already, make sure you have the latest version:  
-  `cf version`  
-  To compare with the latest version from Codefresh, [click here](https://github.com/codefresh-io/cli-v2/releases){:target="\_blank"}.  
-* [Download the CLI]({{site.baseurl}}/docs/clients/csdp-cli/).
+[Upgrade the GitOps CLI]({{site.baseurl}}/docs/clients/upgrade-gitops-cli/).
 
 You have completed setting up your Hosted GitOps Runtime. You are ready to create applications, and connect third-party CI tools for image enrichment.
 
@@ -309,15 +307,15 @@ Optional. Create an application in Codefresh, deploy it to the cluster, and trac
 {:start="2"}
 2. In the Codefresh UI, view your application in the [Applications dashboard](https://g.codefresh.io/2.0/applications-dashboard){:target="\_blank"}.
 
-### (Optional) Connect CI 
+## (Optional) Connect CI 
 Optional. Integrate Codefresh with the third-party tools you use for CI to enrich image information in deployments.  
 
 [Image enrichment with integrations]({{site.baseurl}}/docs/integrations/image-enrichment-overview/) 
 
 ### Related articles
-[Monitoring & managing GitOps Runtimes]({{site.baseurl}}/docs/installation/monitor-manage-runtimes/)  
-[Add Git Sources to runtimes]({{site.baseurl}}/docs/installation/git-sources/)  
+[Monitoring & managing GitOps Runtimes]({{site.baseurl}}/docs/installation/gitops/monitor-manage-runtimes/)  
+[Add Git Sources to runtimes]({{site.baseurl}}/docs/installation/gitops/git-sources/)  
 [Shared configuration repo]({{site.baseurl}}/docs/reference/shared-configuration)  
-[Home dashboard]({{site.baseurl}}/docs/reporting/home-dashboard/)   
-[DORA metrics]({{site.baseurl}}/docs/reporting/dora-metrics/)
+[Home dashboard]({{site.baseurl}}/docs/dashboards/home-dashboard/)   
+[DORA metrics]({{site.baseurl}}/docs/dashboards/dora-metrics/)