diff --git a/cli_reference/openshift_developer_cli/installing-odo.adoc b/cli_reference/openshift_developer_cli/installing-odo.adoc index 4c68f1df46..37a38116f6 100644 --- a/cli_reference/openshift_developer_cli/installing-odo.adoc +++ b/cli_reference/openshift_developer_cli/installing-odo.adoc @@ -5,10 +5,16 @@ include::modules/common-attributes.adoc[] :context: installing-odo toc::[] -The following section describes how to install {odo-title} on different platforms. +The following section describes how to install {odo-title} on different platforms. + +[NOTE] +==== +Currently, {odo-title} does not support installation in a restricted network environment. +==== + include::modules/openshift-developer-cli-installing-odo-on-linux.adoc[leveloffset=+1] include::modules/openshift-developer-cli-installing-odo-on-windows.adoc[leveloffset=+1] -include::modules/openshift-developer-cli-installing-odo-on-macos.adoc[leveloffset=+1] \ No newline at end of file +include::modules/openshift-developer-cli-installing-odo-on-macos.adoc[leveloffset=+1] diff --git a/release_notes/ocp-4-2-release-notes.adoc b/release_notes/ocp-4-2-release-notes.adoc index 46646a9491..e7457ed483 100644 --- a/release_notes/ocp-4-2-release-notes.adoc +++ b/release_notes/ocp-4-2-release-notes.adoc @@ -285,11 +285,11 @@ Limit Calculator] to estimate cluster limits for your environment. [id="ocp-4-2-ODO"] ==== OpenShift Do -OpenShift Do (ODO) is a CLI tool for developers to create, build, and deploy -applications on OpenShift. ODO is completely client based and requires no server +OpenShift Do (odo) is a CLI tool for developers to create, build, and deploy +applications on OpenShift. The odo tool is completely client-based and requires no server within the {product-title} cluster for deployment. It detects changes to local code and deploys it to the cluster automatically, giving instant feedback to -validate changes in real time. It supports multiple languages and frameworks. +validate changes in real time. It supports multiple programming languages and frameworks. [id="ocp-4-2-CRC"] ==== CodeReady Containers diff --git a/welcome/index.adoc b/welcome/index.adoc index bf468a5d81..a3d427730f 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -81,9 +81,9 @@ status, connect and group components, and modify your code base. - ** xref:../cli_reference/openshift_developer_cli/understanding-odo.adoc#understanding-odo[Use the developer CLI tool (odo)]**: -The odo CLI tool lets developers create single- or multi-component applications +The odo CLI tool lets developers create single or multi-component applications easily and automates deployment, build, and service route configurations. -It abstracts away complex Kubernetes and {product-title} concepts enabling developers to focus on developing their applications. +It abstracts complex Kubernetes and {product-title} concepts, allowing developers to focus on developing their applications. - **xref:../operators/olm-what-operators-are.adoc#olm-what-operators-are[Understand Operators]**: Operators are the preferred method for creating on-cluster applications for {product-title} {product-version}. Learn about the Operator Framework and how to deploy applications using installed Operators into your projects. @@ -234,8 +234,7 @@ be reviewed by cluster administrators and xref:../operators/olm-adding-operators - **xref:../monitoring/cluster-monitoring/about-cluster-monitoring.adoc#about-cluster-monitoring[Monitor clusters]**: Learn to xref:../monitoring/cluster-monitoring/configuring-the-monitoring-stack.adoc#configuring-the-monitoring-stack[configure the monitoring stack]. Once your monitoring is configured, use the Web UI to xref:../monitoring/cluster-monitoring/prometheus-alertmanager-and-grafana.adoc#prometheus-alertmanager-and-grafana[access Prometheus, Alertmanager, and Grafana]. -Learn to -xref:../monitoring/cluster-monitoring/managing-cluster-alerts.adoc#managing-cluster-alerts[manage alerts] +Learn to xref:../monitoring/cluster-monitoring/managing-cluster-alerts.adoc#managing-cluster-alerts[manage alerts] using the Alertmanager UI. Learn to xref:../monitoring/cluster-monitoring/examining-cluster-metrics.adoc#examining-cluster-metrics[visualize and examine cluster metrics] with the Metrics UI. Expose xref:../monitoring/exposing-custom-application-metrics-for-autoscaling.html[custom application metrics] for horizontal pod autoscaling.