Rebase OSDOCS-3986-Version3

Author: jneczypor

_topic_maps/_topic_map_osd.yml

@@ -100,6 +100,78 @@ Topics:
 - Name: Deleting an OpenShift Dedicated cluster
   File: osd-deleting-a-cluster
 ---
+Name: CLI tools
+Dir: cli_reference
+Distros: openshift-dedicated
+Topics:
+- Name: CLI tools overview
+  File: index
+- Name: OpenShift CLI (oc)
+  Dir: openshift_cli
+  Topics:
+  - Name: Getting started with the OpenShift CLI
+    File: getting-started-cli
+  - Name: Configuring the OpenShift CLI
+    File: configuring-cli
+  - Name: Usage of oc and kubectl commands
+    File: usage-oc-kubectl
+  - Name: Managing CLI profiles
+    File: managing-cli-profiles
+  - Name: Extending the OpenShift CLI with plugins
+    File: extending-cli-plugins
+  # - Name: Managing CLI plugins with Krew
+  # File: managing-cli-plugins-krew
+  #  Distros: openshift-dedicated
+  - Name: OpenShift CLI developer command reference
+    File: developer-cli-commands
+  - Name: OpenShift CLI administrator command reference
+    File: administrator-cli-commands
+    Distros: openshift-dedicated
+- Name: Developer CLI (odo)
+  File: odo-important-update
+  # Dir: developer_cli_odo
+  Distros: openshift-dedicated
+  # Topics:
+  # - Name: odo release notes
+  #  File: odo-release-notes
+  # - Name: Understanding odo
+  #  File: understanding-odo
+  # - Name: Installing odo
+  #  File: installing-odo
+  # - Name: Configuring the odo CLI
+  #  File: configuring-the-odo-cli
+  # - Name: odo CLI reference
+  #  File: odo-cli-reference
+- Name: Knative CLI (kn) for use with OpenShift Serverless
+  File: kn-cli-tools
+  Distros: openshift-dedicated
+- Name: Pipelines CLI (tkn)
+  Dir: tkn_cli
+  Distros: openshift-dedicated
+  Topics:
+  - Name: Installing tkn
+    File: installing-tkn
+  - Name: Configuring tkn
+    File: op-configuring-tkn
+  - Name: Basic tkn commands
+    File: op-tkn-reference
+- Name: opm CLI
+  Dir: opm
+  Distros: openshift-dedicated
+  Topics:
+  - Name: Installing the opm CLI
+    File: cli-opm-install
+  - Name: opm CLI reference
+    File: cli-opm-ref
+- Name: Operator SDK
+  Dir: osdk
+  Distros: openshift-dedicated
+  Topics:
+  - Name: Installing the Operator SDK CLI
+    File: cli-osdk-install
+  - Name: Operator SDK CLI reference
+    File: cli-osdk-ref
+---
 Name: Cluster administration
 Dir: osd_cluster_admin
 Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

@@ -164,20 +164,91 @@ Topics:
   - Name: Command quick reference for creating clusters and users
     File: rosa-quickstart
 ---
-Name: ROSA CLI
-Dir: rosa_cli
+Name: CLI tools
+Dir: cli_reference
 Distros: openshift-rosa
 Topics:
-# - Name: CLI and web console
-#   File: rosa-cli-openshift-console
-- Name: Getting started with the ROSA CLI
-  File: rosa-get-started-cli
-- Name: Managing objects with the ROSA CLI
-  File: rosa-manage-objects-cli
-- Name: Checking account and version information with the ROSA CLI
-  File: rosa-checking-acct-version-cli
-- Name: Checking logs with the ROSA CLI
-  File: rosa-checking-logs-cli
+- Name: CLI tools overview
+  File: index
+- Name: OpenShift CLI (oc)
+  Dir: openshift_cli
+  Topics:
+  - Name: Getting started with the OpenShift CLI
+    File: getting-started-cli
+  - Name: Configuring the OpenShift CLI
+    File: configuring-cli
+  - Name: Usage of oc and kubectl commands
+    File: usage-oc-kubectl
+  - Name: Managing CLI profiles
+    File: managing-cli-profiles
+  - Name: Extending the OpenShift CLI with plugins
+    File: extending-cli-plugins
+ # - Name: Managing CLI plugins with Krew
+  #  File: managing-cli-plugins-krew
+  #  Distros: openshift-rosa
+  - Name: OpenShift CLI developer command reference
+    File: developer-cli-commands
+  - Name: OpenShift CLI administrator command reference
+    File: administrator-cli-commands
+    Distros: openshift-rosa
+- Name: Developer CLI (odo)
+  File: odo-important-update
+  # Dir: developer_cli_odo
+  Distros: openshift-rosa
+  # Topics:
+  # - Name: odo release notes
+  #  File: odo-release-notes
+  # - Name: Understanding odo
+  #  File: understanding-odo
+  # - Name: Installing odo
+  #  File: installing-odo
+  # - Name: Configuring the odo CLI
+  #  File: configuring-the-odo-cli
+  # - Name: odo CLI reference
+  #  File: odo-cli-reference
+- Name: Knative CLI (kn) for use with OpenShift Serverless
+  File: kn-cli-tools
+  Distros: openshift-rosa
+- Name: Pipelines CLI (tkn)
+  Dir: tkn_cli
+  Distros: openshift-rosa
+  Topics:
+  - Name: Installing tkn
+    File: installing-tkn
+  - Name: Configuring tkn
+    File: op-configuring-tkn
+  - Name: Basic tkn commands
+    File: op-tkn-reference
+- Name: opm CLI
+  Dir: opm
+  Distros: openshift-rosa
+  Topics:
+  - Name: Installing the opm CLI
+    File: cli-opm-install
+  - Name: opm CLI reference
+    File: cli-opm-ref
+- Name: Operator SDK
+  Dir: osdk
+  Distros: openshift-rosa
+  Topics:
+  - Name: Installing the Operator SDK CLI
+    File: cli-osdk-install
+  - Name: Operator SDK CLI reference
+    File: cli-osdk-ref
+- Name: ROSA CLI
+  Dir: rosa_cli
+  Distros: openshift-rosa
+  Topics:
+    # - Name: CLI and web console
+    #   File: rosa-cli-openshift-console
+    - Name: Getting started with the ROSA CLI
+      File: rosa-get-started-cli
+    - Name: Managing objects with the ROSA CLI
+      File: rosa-manage-objects-cli
+    - Name: Checking account and version information with the ROSA CLI
+      File: rosa-checking-acct-version-cli
+    - Name: Checking logs with the ROSA CLI
+      File: rosa-checking-logs-cli
 ---
 Name: Red Hat OpenShift Cluster Manager
 Dir: ocm

adding_service_cluster/rosa-available-services.adoc

@@ -7,7 +7,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
 
 You can add services to your existing {product-title} (ROSA) cluster using the xref:../adding_service_cluster/adding-service.adoc#adding-service[{cluster-manager-first} console].
 
-These services can also be installed xref:../rosa_cli/rosa-manage-objects-cli.adoc#rosa-managing-objects-cli[using the ROSA CLI (`rosa`)].
+These services can also be installed xref:../cli_reference/rosa_cli/rosa-manage-objects-cli.adoc#rosa-managing-objects-cli[using the `rosa` CLI].
 
 
 include::modules/aws-cloudwatch.adoc[leveloffset=+1]

cli_reference/index.adoc

@@ -6,23 +6,53 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-A user performs a range of operations while working on {product-title} such as the following:
+A user performs a range of operations while working on {product-title} 
+ifdef::openshift-rosa[]
+(ROSA)
+endif::openshift-rosa[]
+such as the following:
 
 * Managing clusters
 * Building, deploying, and managing applications
 * Managing deployment processes
 * Developing Operators
 * Creating and maintaining Operator catalogs
 
-{product-title} offers a set of command-line interface (CLI) tools that simplify these tasks by enabling users to perform various administration and development operations from the terminal.
+ifndef::openshift-rosa[]
+{product-title}
+endif::openshift-rosa[]
+ifdef::openshift-rosa[]
+ROSA
+endif::openshift-rosa[]
+offers a set of command-line interface (CLI) tools that simplify these tasks by enabling users to perform various administration and development operations from the terminal.
 These tools expose simple commands to manage the applications, as well as interact with each component of the system.
 
 [id="cli-tools-list"]
 == List of CLI tools
 
-The following set of CLI tools are available in {product-title}:
+The following set of CLI tools are available in
+ifndef::openshift-rosa[]
+{product-title}:
+endif::openshift-rosa[]
+ifdef::openshift-rosa[]
+ROSA:
+endif::openshift-rosa[]
 
-* xref:../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[OpenShift CLI (oc)]: This is the most commonly used CLI tool by {product-title} users. It helps both cluster administrators and developers to perform end-to-end operations across {product-title} using the terminal. Unlike the web console, it allows the user to work directly with the project source code using command scripts.
+* xref:../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[OpenShift CLI (`oc`)]: 
+ifndef::openshift-rosa[]
+This is the most commonly used CLI tool by {product-title} users.
+endif::openshift-rosa[]
+ifdef::openshift-rosa[]
+This is one of the more commonly used developer CLI tools.
+endif::openshift-rosa[]
+It helps both cluster administrators and developers to perform end-to-end operations across 
+ifndef::openshift-rosa[]
+{product-title}
+endif::openshift-rosa[]
+ifdef::openshift-rosa[]
+ROSA
+endif::openshift-rosa[]
+using the terminal. Unlike the web console, it allows the user to work directly with the project source code using command scripts.
 
 * xref:../cli_reference/kn-cli-tools.adoc#kn-cli-tools[Knative CLI (kn)]: The Knative (`kn`) CLI tool provides simple and intuitive terminal commands that can be used to interact with OpenShift Serverless components, such as Knative Serving and Eventing.
 
@@ -31,3 +61,8 @@ The following set of CLI tools are available in {product-title}:
 * xref:../cli_reference/opm/cli-opm-install.adoc#cli-opm-install[opm CLI]: The `opm` CLI tool helps the Operator developers and cluster administrators to create and maintain the catalogs of Operators from the terminal.
 
 * xref:../cli_reference/osdk/cli-osdk-install.adoc#cli-osdk-install[Operator SDK]: The Operator SDK, a component of the Operator Framework, provides a CLI tool that Operator developers can use to build, test, and deploy an Operator from the terminal. It simplifies the process of building Kubernetes-native applications, which can require deep, application-specific operational knowledge.
+
+
+ifdef::openshift-rosa[]
+* xref:../cli_reference/rosa_cli/rosa-get-started-cli.adoc#rosa-get-started-cli[ROSA CLI (`rosa`)]: Use the `rosa` CLI to create, update, manage, and delete ROSA clusters and resources.
+endif::openshift-rosa[]

cli_reference/odo-important-update.adoc

@@ -11,7 +11,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-Red Hat does not provide information about `{odo-title}` on the {OCP} documentation site. See the link:https://odo.dev/docs/introduction[documentation] maintained by Red Hat and the upstream community for documentation information related to `{odo-title}`.
+Red Hat does not provide information about `{odo-title}` on the {product-title} documentation site. See the link:https://odo.dev/docs/introduction[documentation] maintained by Red Hat and the upstream community for documentation information related to `{odo-title}`.
 
 [IMPORTANT]
 ====

cli_reference/openshift_cli/extending-cli-plugins.adoc

@@ -7,7 +7,14 @@ include::_attributes/common-attributes.adoc[]
 toc::[]
 
 You can write and install plugins to build on the default `oc` commands,
-allowing you to perform new and more complex tasks with the {product-title} CLI.
+allowing you to perform new and more complex tasks with the
+ifndef::openshift-dedicated,openshift-rosa[]
+{product-title}
+endif::openshift-dedicated,openshift-rosa[]
+ifdef::openshift-rosa,openshift-dedicated[]
+OpenShift
+endif::openshift-rosa,openshift-dedicated[]
+CLI.
 
 // Writing CLI plugins
 include::modules/cli-extending-plugins-writing.adoc[leveloffset=+1]

cli_reference/openshift_cli/managing-cli-profiles.adoc

@@ -7,13 +7,19 @@ include::_attributes/common-attributes.adoc[]
 toc::[]
 
 A CLI configuration file allows you to configure different profiles, or contexts, for use with the xref:../../cli_reference/index.adoc#cli-tools-overview[CLI tools overview]. A context consists of
-ifndef::microshift[]
+ifndef::microshift,openshift-dedicated,openshift-rosa[]
 xref:../../authentication/understanding-authentication.adoc#understanding-authentication[user authentication]
-endif::[]
+endif::microshift,openshift-dedicated,openshift-rosa[]
 ifdef::microshift[]
 user authentication
 endif::[]
-and {product-title} server information associated with a _nickname_.
+ifndef::openshift-rosa[]
+an {product-title}
+endif::openshift-rosa[]
+ifdef::openshift-rosa[]
+the {product-title} (ROSA)
+endif::openshift-rosa[]
+server information associated with a _nickname_.
 
 include::modules/about-cli-profiles-switch.adoc[leveloffset=+1]