Merge branch 'v2.x' into W-14222043-Cloudhub-2.0-Proxy-KL

Author: glenn-rodgers-sf

modules/ROOT/pages/_partials/task-add-api-instance.adoc

@@ -99,7 +99,7 @@ See xref:runtime-fabric::proxy-deploy-runtime-fabric.adoc[Deploying API Proxies
 .. Update the *Asset type*, *API version*, and *Asset version* if you are not using the latest version.
 +
 For more information about versions in Exchange, see xref:exchange::asset-versions.adoc[].
-.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is non-conformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
+.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is nonconformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
 
 * Click **Create new API**:
 [arabic]
@@ -118,7 +118,7 @@ Upload either a RAML or OAS file for your REST API. Versions 2.0.0 and later are
 .. Update the *Asset type*, *API version*, and *Asset version* if you are not using the latest version.
 +
 For more information about versions in Exchange, see xref:exchange::asset-versions.adoc[].
-.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is non-conformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
+.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is nonconformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
 . Click *Next*.
 //end::asset-type-options-flex[]
 
@@ -138,7 +138,7 @@ This option is not available for Flex Gateway runtime at this time.
 .. Update the *Asset type*, *API version*, and *Asset version* if you are not using the latest version.
 +
 For more information about versions in Exchange, see xref:exchange::asset-versions.adoc[].
-.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is non-conformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
+.. If you chose a *RAML/OAS* asset type, view the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is nonconformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[].
 . Click *Next*.
 //end::asset-type-options[]
 
@@ -152,7 +152,7 @@ NOTE: Anypoint API Manager supports OpenAPI Specification (OAS) 3.0, with the ex
 .. Update the *Asset type*, *API version*, and *Asset version* if you are not using the latest version.
 +
 For more information about versions in Exchange, see xref:exchange::asset-versions.adoc[].
-.. View the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is non-conformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[]
+.. View the *Conformance Status* of the API to ensure the API is conformant. If the *Conformance Status* is nonconformant, after deployment, view the *Governance Report* to find and fix the conformance issues. For more information about the *Governance Report*, see xref:govern-api-instances.adoc[]
 . Click *Next*.
 //end::raml-oas[]
 

modules/ROOT/pages/_partials/task-promote-api.adoc

@@ -1,5 +1,5 @@
 [[promote-api]]
-== Promote API from Environment
+== Promote an API Instance from Another Environment
 
 . Navigate to *Anypoint Platform* > *API Manager*. 
 . In *API Administration*, click **Add API** and select **Promote API from environment**.

modules/ROOT/pages/govern-api-instances.adoc

@@ -20,7 +20,7 @@ To create custom rulesets that enforce your own API management standards, see xr
 
 [[view-api-manager]]
 
-== View and Fix Instance Conformance issues in API Manager
+== View and Fix Instance Conformance Issues in API Manager
 
 To view the conformance status of an API instance:
 

modules/ROOT/pages/latest-overview-concept.adoc

@@ -103,7 +103,7 @@ see xref:api-contracts-landing-page.adoc[Client Applications and Contracts].
 
 === API Instances
 
-An API instance describes a configuration of an API that is deployed on one of the following runtimes: Flex Gateway, Mule Gateway, or Service Mesh. API instances are managed by API Manager after they are created using add, promote, or import options. API instances remain under management until they are deleted.
+An API instance describes a configuration of an API that is deployed on one of the following runtimes: Flex Gateway, Mule Gateway, or Service Mesh. API instances are managed by API Manager after they are created by using the add, promote, or import options. API instances remain under management until they are deleted.
 
 The API Summary shows key information about a deployed API instance:
 
@@ -166,9 +166,9 @@ To edit an API instance, see xref:edit-api-endpoint-task.adoc[Edit an API Instan
 
 API Governance is integrated with API Manager to identify the conformance status of your API instances.
 
-API Governance tests API instance against Rulesets to determine conformance issues such as missing policies and missing TLS contexts.
+API Governance tests API instances against rulesets to determine conformance issues such as missing policies and missing TLS contexts.
 
-You can view the governance validation report details to get the information you need to fix the conformance issues. The validation report is available both in API Manager on the Governance Report page and in API Governance.
+You can view the governance validation report details to get the information you need to fix conformance issues. The validation report is available both in API Manager on the Governance Report page and in API Governance.
 
 To learn more about governing your API instances, see xref:govern-api-instances.adoc[Govern API Instances].
 

modules/ROOT/pages/promote-api-task.adoc

@@ -3,25 +3,19 @@ ifndef::env-site,env-github[]
 include::_attributes.adoc[]
 endif::[]
 
-A tight integration of Anypoint Platform components extends the use of environments to API management. In this procedure, you change the environment of an API.
+Before promoting an API instance to another environment, ensure that you have the `Manage APIs Configuration` permission.
 
-You must have `Manage APIs Configuration` permission to promote an API and `Access Management` permission to set permissions for viewing and managing an entity. You can only promote an entity (Policies, Alerts, and so forth) if you have permission to view the source and permission to manage the destination over each entity. Typical view permissions are `View API Configuration` and `View Policies`, as explained in xref:environment-permission-task.adoc[To Grant Permission to Access Environments]. Set the permissions as needed before proceeding.
+You can only promote an entity, such as policies or alerts, if you have both the permissions to view the entity and to manage its destination. For example, you must have the `View Policies` and `Manage Policies` permissions to promote a policy. 
 
-. Navigate to *Anypoint Platform* > *API Manager*. 
-. In *API Administration*lick *Add API* and select *Promote API from environment*.
-. For *Source Environment*, select the environment of the API to promote.
-. For *API*, enter the name of the API and then select it from the APIs in the source environment.
-. For *API Version*, select the version of the API.
-. Optionally, for *API instance label*, select the API instance name if you created any instances.
-. Select or deselect entities to include in the promotion: Policies, SLAs, Alerts, and API Configuration.
-. Optionally, if your external client provider differs in the environment to which your are promoting the API, select the provider in the *Client provider* list.
-. Click *Promote*.
+To promote an API instance:
 
-Promoting an API affects only the API definition, not the existing deployed applications subscribed to the API. After promoting an API, the API Name remains the same, but the API ID changes.
+include::partial$task-promote-api.adoc[]
 
-For existing applications that need to subscribe to a promoted API, you need to make the following changes:
+Promoting an API instance affects only the API definition, not the existing deployed applications subscribed to the instance. After promoting an API, the *API Label* remains the same, but the *API Instance ID* changes.
 
-. Update the API ID.
+For existing applications that must subscribe to a promoted API instance:
+
+. Update the *API Instance ID* within the application.
 . Because each environment has a different client ID and secret, update the application's client ID and secret.
 
 == See Also