Merge branch 'v2.x' into W-18296666-add-final-base-path-fa

Author: failup

modules/ROOT/pages/_partials/api-configuration-tables.adoc

@@ -1,4 +1,4 @@
-//tag::flex-downstream[]
+//tag::flex-downstream-self-managed[]
 [%header%autowidth.spread,cols="15%,35%,15%,35%"]
 |===
 | Field Name | Description | Required | Notes
@@ -9,9 +9,20 @@
 | *Instance label* | Specifies a label for the API. | No | If you have multiple managed instances of the same API, add a label to differentiate each instance from the others.
 | *Advanced Options* |  |  |
 | *Consumer endpoint* | Specifies a proxy application's address for consumers to use for sending requests.| No |
+|===
+//end::flex-downstream-self-managed[]
+
+//tag::flex-downstream-managed[]
+[%header%autowidth.spread,cols="15%,35%,15%,35%"]
+|===
+| Field Name | Description | Required | Notes
+| *Base path* | Specifies the URL prefix for all API paths, relative to the host root. It must start with a leading slash `/`. | Yes | 
 | *Client provider* | Specifies a client provider for the API. | No | Anypoint Platform acts as the client provider by default. To configure an external client provider, see xref:access-management::managing-api-clients.adoc[Client Providers]. 
+| *Instance label* | Specifies a label for the API. | No | If you have multiple managed instances of the same API, add a label to differentiate each instance from the others.
+| *Advanced Options* |  |  |
+| *Consumer endpoint* | Specifies a proxy application's address for consumers to use for sending requests.| No |
 |===
-//end::flex-downstream[]
+//end::flex-downstream-managed[]
 
 //tag::flex-upstream[]
 [%header%autowidth.spread,cols="15%,35%,15%,35%"]

modules/ROOT/pages/create-instance-task-flex.adoc

@@ -16,7 +16,7 @@ include::partial$task-add-api-instance.adoc[tags=intro1;flex-intro;intro2]
 +
 [NOTE]
 --
-If you do not see a Flex Gateway listed, or you see a Flex Gateway but its status is DISCONNECTED,
+If you don't see a Flex Gateway listed, or you see a Flex Gateway but its status is *Not Running*,
 See xref:gateway::flex-install.adoc[Install Flex Gateway] and xref:gateway::flex-conn-reg-run.adoc[Register and Run in Connected Mode] for more information.
 --
 
@@ -26,7 +26,17 @@ include::partial$task-add-api-instance.adoc[tags=mid-steps;asset-type-options-fl
 
 . Configure the downstream configuration settings:
 +
-include::partial$api-configuration-tables.adoc[tags=flex-downstream]
+.Managed Flex Gateway
+[%collapsible]
+====
+include::partial$api-configuration-tables.adoc[tags=flex-downstream-managed]
+====
++
+.Self-Managed Flex Gateway (Connected Mode)
+[%collapsible]
+====
+include::partial$api-configuration-tables.adoc[tags=flex-downstream-self-managed]
+====
 . Click *Next*.
 . Configure one of the following upstream configurations:
 ** *Single Upstream Service* +
@@ -179,4 +189,4 @@ include::partial$task-import-api.adoc[]
 
 == Notes
 
-* Although OpenAPI Specification (OAS) 3.0 is supported, the callback feature is not. To work around this issue, either handle the callback outside of the Mule runtime engine domain or use an OAS 3.0 specification that does not use callbacks.
+* Although OpenAPI Specification (OAS) 3.0 is supported, the callback feature is not. To work around this issue, either handle the callback outside of the Mule runtime engine domain or use an OAS 3.0 specification that doesn't use callbacks.

modules/ROOT/pages/getting-started-proxy.adoc

@@ -19,7 +19,7 @@ in API Manager.
 +
 An API instance is a proxy of an API that serves the upstream. API instances support the application of policies
 and can be deployed to an API gateway.
-. xref:policies::policies-included-apply.adoc[Apply a Policy in API Manager]
+. xref:mule-gateway::policies-included-apply.adoc[Apply a Policy in API Manager]
 +
 A policy extends the functionality of an API and enforces certain capabilities such as security. A policy
 can control access and traffic. For example, a policy can generally control authentication, access,