diff --git a/vuepress/docs/next/docs/README.md b/vuepress/docs/next/docs/README.md
index bb11b8d914..3ef11e3184 100644
--- a/vuepress/docs/next/docs/README.md
+++ b/vuepress/docs/next/docs/README.md
@@ -10,16 +10,19 @@ only be available by building from source.
# Entando Platform
-Entando is the leading open source **Application Composition Platform** for Kubernetes. It enables parallel teams to accelerate development and innovation of business capabilities on a modern, cloud-native, and Kubernetes-native stack.
+Entando is an open-source application composition platform (ACP) that streamlines the development of composable applications for the web. By implementing a modular architecture, the Platform enables parallel teams to accelerate development and innovation on a modern, cloud-native, and Kubernetes-native stack.
+
+With Entando’s distributed working environment, you can build applications composed of modular reusable components and manage them all from one platform. The system includes development and runtime tools, a component catalog, and a component orchestrator to support all aspects of the development lifecycle.
-It is a distributed and composable environment in which components can be built, scaled and iterated independently, helping teams build agile applications that can adapt to change.
![Entando Platform Development Process](./getting-started/img/concepts.png)
-On the Entando Platform, development of an application is organized into four stages: Create, Curate, Compose, and Consume. In the simplest terms, you create functional building blocks, curate them in a catalog, compose the blocks into an application, which is then consumed by a user. The Enterprise Architect oversees the process, defining business domains and mapping the capabilities for the building blocks.
+Development on Entando can be organized into four stages: Create, Curate, Compose, and Consume. In the simplest terms, you create functional building blocks or bundles, curate them in a catalog, compose them into an application, which is then consumed by a user. The Enterprise Architect oversees the process, defining business domains and mapping capabilities for the building blocks.
-## Create Components
-Building a composable application on Entando involves designing and creating each independent component or building block. Developers can use the [Entando Component Generator](./create/component-gen-overview.md) and [Blueprint](./create/blueprint-features.md) to automate the building and packaging of projects using any technology they choose. The modular architecture of apps built on Entando means new business capabilities can be easily integrated without reworking existing systems.
+
+
+## Create
+Building a composable application begins with self-contained bundles, created from scratch or using existing code. With the freedom to choose the technologies and frameworks that meet their needs, developers can use the [Entando Component Generator](./create/component-gen-overview.md) and [Blueprint](./create/blueprint-features.md) to speed up the process. The composable methods of Entando mean innovations can be easily integrated without reworking existing systems.
| Documentation | Tutorials |
| :------------ | :--------- |
@@ -27,31 +30,29 @@ Building a composable application on Entando involves designing and creating eac
| [Entando Blueprint Feature](./create/blueprint-features.md) | [Microservices](../tutorials/create/ms/generate-microservices-and-micro-frontends.md) |
| [Component Generation Technologies](./create/component-gen-tech.md) | [Build and Publish Project Bundles](../tutorials/create/pb/publish-project-bundle.md) |
-## Curate and Share Components
-On the Entando Platform, Curate and Share means development teams can bundle and share components within a central catalog. Multiple teams can collaborate on a single component or packaged business capabilities (PBCs) and share them across organizations and applications. They can test and assess components for readiness, manage and publish versions, and share metadata for continuous upgrades.
+## Curate
+In this stage, curators discover and organize components to share across teams and projects. The components can be sourced internally or from the [Entando Marketplace](https://entando.com/composable-platform/packaged-business-capabilities/) which offers a selection of pre-built solutions. Curators assess, publish, and share component features and metadata in a private or public hub, ensuring that it is discoverable. Centralizing these functions also makes is easier to govern the consistency of the reusable bundles.
| Documentation | Tutorials |
| :------------ | :-------- |
-| [Bundle and Component Descriptors](./curate/bundle-details.md) | [Install Bundles from a Private Image Registry](../tutorials/curate/bundle-private-images.md) |
-| [Filtering Bundles](./curate/bundle-filters.md) | [Install Bundle Microservices from a Private Image Registry](../tutorials/curate/ms-private-images.md) |
-| [Customize Bundle Info in App Builder](./curate/bundle-presentation-config.md) | |
-| [Bundle Version and Updates FAQ](./curate/bundle-versions-faq.md) | |
-| [Bundle Uninstall](./curate/uninstall-flow.md) | |
+| [Bundle Details](./curate/bundle-details.md) | [Install Bundles from a Private Image Registry](../tutorials/curate/bundle-private-images.md) |
+| [Bundle Component Descriptors](./curate/bundle-component-details.md) | [Install Bundle Microservices from a Private Image Registry](../tutorials/curate/ms-private-images.md) |
+| [Enterprise Entando Hub](./curate/hub-details.md) | |
+
-## Compose an Application
-The Compose stage is centered around the [Entando App Builder](./compose/app-builder.md), a low-code composition user interface where an application can be assembled using the prebuilt modular templates, widgets, PBCs and others. The [Entando Component Manager](./compose/ecm-overview.md) and [Local Hub](./compose/local-hub-overview.md) are integrated into the App Builder to manage your components, providing speed and flexibility.
+## Compose
+The Compose stage involves assembling the bundles, packaged business capabilities (PBCs), templates and other resources into an application. Centered around the visual interface, the [Entando App Builder](./compose/app-builder.md), the Platform provides tooling to define the structure, layouts, and interactions between micro frontends within an application. This unified environment, with direct access to the Entando catalogs, leads to the creation of a more cohesive and seamless user experience across a complex application.
| Documentation | Tutorials |
| :------------ | :-------- |
-| [Welcome Wizard](./compose/welcome-wizard.md) | [Page Management](../tutorials/compose/page-management.md) |
+| [App Builder Welcome Wizard](./compose/welcome-wizard.md) | [Create and Manage a Page](../tutorials/compose/page-management.md) |
| [Local Hub](./compose/local-hub-overview.md) | [Widgets and Fragments](../tutorials/compose/widgets-fragments.md) |
-| [Entando App Builder](./compose/app-builder.md) | [Content Creation](../tutorials/compose/content-tutorial.md) |
-| [Entando Component Manager](./compose/ecm-overview.md) | [Content Templates](../tutorials/compose/content-templates-tutorial.md) |
+| [Entando Component Manager](./compose/ecm-overview.md) | [Content Templates](../tutorials/compose/content-templates-tutorial.md) |
| | [Digital Assets](../tutorials/compose/digital-assets-tutorial.md) |
-## Consume Applications
-In the development lifecycle of an application, Consume is the execution stage where users interact with the app. On Entando, the modular design of components and services means they can be scaled individually, or as a whole, according to those interactions. Likewise, content can be updated, engine rules adapted, and upgrades carried out seamlessly. As a result, the development cycle is a continuous process with minimal disruptions and faster time to market.
+## Consume
+In the lifecycle of an application, Consume is the execution stage where users interact with the application, using browsers, mobile devices, and conversational interfaces. On Entando, the modular design of components and services means they can be scaled independently, governed consistently, and new features integrated uniformly, as user's needs change. Likewise, content can be updated, interactions improved, and upgrades carried out in a continuous process, with minimal disruptions and faster time to market.
| Documentation | Tutorials |
| :------------ | :-------- |
diff --git a/vuepress/docs/next/docs/consume/identity-management.md b/vuepress/docs/next/docs/consume/identity-management.md
index 3417bad140..4018a0f50f 100644
--- a/vuepress/docs/next/docs/consume/identity-management.md
+++ b/vuepress/docs/next/docs/consume/identity-management.md
@@ -35,7 +35,7 @@ Keycloak authorizes microservices using clients and roles. Authorizations are st
Below are the steps to grant a user one or more roles for a specific client. This controls permissions when configuring the microservice. Note, when a microservice is installed in Entando, a corresponding client (and set of roles) is created within its plugin definition.
1. [Log in to Keycloak](#logging-into-your-keycloak-instance)
->For non-external Keycloak instances, it is [the base URL of your running Entando application](../getting-started/README.md#configure-access-to-your-cluster) followed by `/auth/`, e.g. http://YOUR-HOST-NAME/auth. In a standard Entando installation, the base URL can be verified with `kubectl get ingress/default-sso-in-namespace-ingress`.
+>For non-external Keycloak instances, it is the base URL of your running Entando application followed by `/auth/`, e.g. http://YOUR-HOST-NAME/auth. In a standard Entando installation, the base URL can be verified with `kubectl get ingress/default-sso-in-namespace-ingress`.
2. Select `Users` from the left menu
3. Use the search box to find the appropriate user, e.g. "admin"
4. Click on the user ID
diff --git a/vuepress/docs/next/docs/getting-started/README.md b/vuepress/docs/next/docs/getting-started/README.md
index 18054f316a..30ea590484 100644
--- a/vuepress/docs/next/docs/getting-started/README.md
+++ b/vuepress/docs/next/docs/getting-started/README.md
@@ -9,27 +9,27 @@ You can set up Entando in two simple steps or install it manually to meet your s
* [Automatic Install](#automatic-install): The fastest way to locally install and start up Entando in Kubernetes.
* [Manual Install](#manual-install): Useful if you want a shared cluster or a custom local instance.
->Installation on ARM:
+>Installation on Apple Silicon processors:
To install Entando on Mac systems running ARM64 architecture, see this alternate [Getting Started](../../tutorials/getting-started/arm-install.md) guide.
## Automatic Install
Automatically install Entando via the Entando command-line interface (CLI) and prepare a local developer environment with default settings.
-The following steps launch an Ubuntu VM via Multipass, install Kubernetes, then deploy Entando to it.
+The following steps launch an Ubuntu VM via Multipass, install Kubernetes, and then deploy Entando to it.
-1. Install [Multipass](https://multipass.run/#install)
+1. Install [Multipass](https://multipass.run/#install).
-2. Install Entando into Kubernetes on Ubuntu using the [Entando CLI](entando-cli.md)
+2. Install Entando into Kubernetes on Ubuntu using the [Entando CLI](entando-cli.md):
curl -sL "https://get.entando.org" | ENTANDO_RELEASE="{{ $site.themeConfig.entando.fixpack.v73 }}" bash
-3. The progress of the install is displayed on the console. Installation can take up to 10 minutes, depending on how long the Docker images take to download. The sequence of steps performed by the CLI is identical to the manual steps below. To understand what the CLI does, review the manual steps.
+3. The progress of the install is displayed on the console. Installation can take up to 10 minutes, depending on how long the Docker images take to download. The sequence of steps performed by the CLI is identical to the manual steps below. To better understand what the CLI does, review the manual steps.
4. The URL to access the Entando App Builder will print to the console once the install completes.
-5. Login with username:`admin` and password: `adminadmin`. Refer to [Login to Entando](#login-to-entando) for more information and next steps.
+5. Log in with username:`admin` and password: `adminadmin`. Refer to [Log in to Entando](#log-in-to-entando) for more information and next steps.
## Manual Install
-Manual installation allows you to configure a shared cluster or customize a local developer environment. The following learn-as-you-go approach provides a working knowledge of Kubernetes as you install Entando in a local environment. After downloading the necessary files, your instance of Kubernetes will be up and running in <60 seconds.
+Manual installation allows you to configure a shared cluster or customize a local developer environment. The following learn-as-you-go approach provides additional context about the process in the highlighted text boxes. After downloading the necessary files, your instance of Kubernetes will be up and running in <60 seconds.
This is a three stage process:
@@ -43,20 +43,20 @@ Kubernetes is a container orchestrator designed to manage a server cluster. It r
### Install Kubernetes
-#### Enable Hypervisor
-::: tip Why a Hypervisor?
-Hypervisors allow you to create and run VMs. Virtualization software that run on top of your operating system as "guests" are Type 2 hypervisors, e.g. VirtualBox or VMWare Workstation. Type 1 hypervisors run directly on your host machine.
+#### 1. Enable a Hypervisor
+::: tip Why a hypervisor?
+Hypervisors allow you to create and run VMs. Virtualization software that runs on top of your operating system as a guest is a Type 2 hypervisor, like VirtualBox or VMWare Workstation. Type 1 hypervisors run directly on your host machine.
:::
Install a Type 1 hypervisor for optimal performance.
-**Mac:** Install `hyperkit`
+ - **Mac:** Install `hyperkit`:
-``` bash
-brew install hyperkit
-```
+ ``` bash
+ brew install hyperkit
+ ```
-**Windows:** [Install Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v?redirectedfrom=MSDN)
+ - **Windows:** [Install Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v?redirectedfrom=MSDN)
---
@@ -74,32 +74,32 @@ Install a Type 2 hypervisor that runs on top of your operating system.
-#### Launch an Ubuntu VM
+#### 2. Launch an Ubuntu VM
::: tip Why Multipass?
Multipass is a cross-platform tool developed by the publishers of Ubuntu to create lightweight Ubuntu VMs in seconds.
:::
-1. Install [Multipass](https://multipass.run/#install)
+ 1. Install [Multipass](https://multipass.run/#install)
-2. Launch a VM
+ 2. Launch a VM:
-``` bash
-multipass launch --name quickstart --cpus 4 --mem 8G --disk 20G
-```
+ ``` bash
+ multipass launch --name quickstart --cpus 4 --mem 8G --disk 20G
+ ```
-3. Open a VM shell. (Note: on Windows, you may need to use `winpty multipass`)
+ 3. Open a VM shell (Note on Windows, you may need to use `winpty multipass`):
-``` bash
-multipass shell quickstart
-```
+ ``` bash
+ multipass shell quickstart
+ ```
### Run Kubernetes
::: tip Why K3s?
-K3s is a certified Kubernetes distribution designed for production workloads in resource-constrained environments.
+K3s is a certified light-weight version of Kubernetes designed for production workloads in constrained environments.
-It's packaged as a single <50MB binary that minimizes the dependencies and procedure required to install, run and auto-update a production Kubernetes cluster.
+It's packaged as a single (<50MB) binary that minimizes dependencies and simplifies the procedures required to install, run, and update a production Kubernetes cluster.
:::
1. Install the version of `K3s` supported by Entando 7.3. Note that this may not be the latest version of Kubernetes.
@@ -130,44 +130,43 @@ sudo kubectl get pods -A
You now have a local instance of Kubernetes up and running.
:::
-Now that Kubernetes is running, you can use kubectl to send commands directly to K3s from the host machine, rather than from within the VM. To set this up with the [ent CLI](entando-cli.md), run `ent attach-vm quickstart` and then use `ent kubectl` for any calls to K8s. Alternatively, see the K3s documentation to [access your cluster with kubectl](https://rancher.com/docs/k3s/latest/en/cluster-access/).
+Now that Kubernetes is running, you can use kubectl to send commands directly to K3s from the host machine, rather than from within the VM. To set this up with the [ent CLI](entando-cli.md), run `ent attach-vm quickstart` and then use `ent kubectl` for any calls to Kubernetes. Alternatively, see the K3s documentation to [access your cluster with kubectl](https://rancher.com/docs/k3s/latest/en/cluster-access/).
### Prepare Kubernetes
-To install Entando, we'll add `Custom Resources`, create a `Namespace` and configure external access to our cluster.
-
-#### Create a Namespace
+To install Entando, add the `Custom Resources`, create a `Namespace`, and configure external access to your cluster.
-::: tip What are Namespaces?
-Kubernetes supports multiple virtual clusters backed by the same physical cluster. These virtual clusters are called [namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). You can use namespaces to allocate resources and set CPU/memory limits for individual projects or teams.
-:::
+#### 1. Create a Namespace
``` bash
sudo kubectl create namespace entando
```
+::: tip What are Namespaces?
+Kubernetes supports multiple virtual clusters backed by the same physical cluster. These virtual clusters are called [namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). You can use namespaces to allocate resources and set CPU/memory limits for individual projects or teams.
+:::
-#### Add Custom Resources
+#### 2. Add Custom Resources
::: tip Why Custom Resources?
-Standard resources in Kubernetes include `Pods`, which are groups of one or more containers, `Services` to call or access Pods, and `Ingresses` to enable external access to Services.
+Standard resources in Kubernetes include `Pods` (groups of one or more containers), `Services` to call or access Pods, and `Ingresses` to enable external access to Services.
-[Custom resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) let you store and retrieve structured data. Combining a custom resource with a custom controller allows you to define a desired state to automate how your applications or services run in a Kubernetes cluster.
+[Custom resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) let you store and retrieve structured data. Combining a custom resource with a custom controller allows you to define a desired state to automate how your applications and services run in a Kubernetes cluster.
:::
Examples of custom resources in Entando are the [Entando App Engine](../../docs/getting-started/concepts-overview.md#entando-app-engine) and the [Entando Identity Management System](../../docs/getting-started/concepts-overview.md#entando-identity-management-system).
-From your Ubuntu shell
+From your Ubuntu shell:
-1. Install the cluster-scoped custom resource definitions (CRDs)
+1. Install the cluster-scoped custom resource definition (CRD):
sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v73 }}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
-2. Install the namespace-scoped custom resources
+2. Install the namespace-scoped custom resource:
sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v73 }}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
-#### Configure Access to Your Cluster
+#### 3. Configure Access to Your Cluster
::: tip What about Networking?
Entando sets up [`Ingresses`](https://kubernetes.io/docs/concepts/services-networking/ingress/) in Kubernetes to expose HTTP routes from outside the cluster to services within the cluster. This is used to access Entando from a local browser.
@@ -175,29 +174,32 @@ Entando sets up [`Ingresses`](https://kubernetes.io/docs/concepts/services-netwo
If you run into network issues during startup, or if you are using Windows for your local development instance, you'll need to [troubleshoot your network](../reference/local-tips-and-tricks.md#network-issues). Indications of network issues can include Entando failing to completely start or a working Entando instance failing to restart later.
:::
-To set up external access to your cluster, replace YOUR-HOST-NAME with the fully qualified domain of your Ubuntu VM.
+To set up external access to your cluster, determine the fully qualified domain of your Ubuntu VM for the `ingressHostName` value in the EntandoApp CRD.
-- On Windows with Hyper-V, YOUR-HOST-NAME is the name of your VM followed by `.mshome.net`, e.g. `quickstart.mshome.net`.
+- On Windows with Hyper-V, `ingressHostName` is the name of your VM followed by `.mshome.net`, e.g. `quickstart.mshome.net`.
-- On Mac, Linux, or Windows without Hyper-V, you'll use a host name based on your VM's IP address. You can determine the IP address from within the VM with this command:
+- On Mac, Linux, or Windows without Hyper-V, `ingressHostName` is your VM name, plus you VM's IP address, plus "nip.io". You can determine the IP address from within the VM with this command:
``` bash
hostname -I | awk '{print $1}'
```
-- Your IP-based YOUR-HOST-NAME should follow this pattern: `quickstart.YOUR-IP.nip.io`, e.g. `quickstart.192.168.64.33.nip.io`. The suffix `.nip.io` makes use of the free [nip.io](https://nip.io/) DNS service so that any requests to this host name will resolve to your VM. The prefix `quickstart` is arbitrary so you can choose your own.
+ E.g.: For VM named `quickstart`, IP=`192.168.64.33`
+ `ingressHostName` = `quickstart.192.168.64.33.nip.io`
+
+The suffix `.nip.io` makes use of the free [nip.io](https://nip.io/) DNS service so that any requests to this host name will resolve to your VM. `quickstart` is arbitrary so you can choose your own VM name.
-Now that you've determined YOUR-HOST-NAME, use it to configure the Entando Application.
+Now that you've determined `ingressHostName`, use it to configure the Entando Application.
1. Download the template `entando-app.yaml`.
curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v73 }}/dist/ge-1-1-6/samples/entando-app.yaml"
-2. Modify `entando-app.yaml` to set the `ingressHostName` to YOUR-HOST-NAME. Examples:
-- `ingressHostName`: quickstart.mshome.net
-- `ingressHostName`: quickstart.192.168.63.33.nip.io
+2. Modify `entando-app.yaml` with the `ingressHostName` found in the previous step. Examples:
+- Windows machine: `ingressHostName`: quickstart.mshome.net
+- Mac or Linux: `ingressHostName`: quickstart.192.168.63.33.nip.io
::: tip Embedded Databases
To speed up the _Getting Started_ environment, embedded databases are used by default.
-See this [Tutorial on Default Databases](../../tutorials/devops/default-database.md) for information on how to change your database connection, or you can modify the `dbms` setting in the `entando-app.yaml`.
+See the [Tutorial on Default Databases](../../tutorials/devops/default-database.md) for information on how to change your database connection, or modify the `dbms` setting in the `entando-app.yaml`.
:::
::: tip Entando Operator
@@ -209,7 +211,7 @@ To customize the ingress path of a deployment, refer to the [Configure the Entan
:::
### Deploy Entando
-Deploy Entando by applying `entando-app.yaml` to your namespace.
+1. Deploy Entando by applying `entando-app.yaml` to your namespace.
```sh
sudo kubectl apply -f entando-app.yaml -n entando
@@ -217,7 +219,7 @@ sudo kubectl apply -f entando-app.yaml -n entando
---
-Use the `get pods --watch` command to observe Entando starting up.
+2. Use the `get pods --watch` command to observe Entando starting up.
```sh
sudo kubectl get pods -n entando --watch
@@ -225,16 +227,16 @@ sudo kubectl get pods -n entando --watch
What does a successful startup look like?
-- The `entando-operator` and `entando-k8s-service` start when you apply the namespace resources above, so they should already be in the `Running` status by the time you reach this point
-- When you apply the `entando-app.yaml`, the `quickstart-deployer` starts and kicks off a series of deployments, beginning with the Keycloak deployment via the `default-sso-in-namespace-deployer`
+- The `entando-operator` and `entando-k8s-service` start when you apply the namespace resources above, so they should already be in `Running` status by the time you reach this point.
+- When you apply the `entando-app.yaml`, the `quickstart-deployer` starts and kicks off a series of deployments, beginning with the Keycloak deployment via the `default-sso-in-namespace-deployer`.
**Jobs / Deployments**
-- Some Pods, like `quickstart-deployer`, run to completion and then shutdown; they should eventually show `READY`: `0/1` and `STATUS`: `Completed`
+- Some Pods, like `quickstart-deployer`, run to completion and then shutdown; they should eventually show `READY`: `0/1` and `STATUS`: `Completed`.
- Other deployments, like `quickstart-ab-deployment` or `quickstart-deployment`, should eventually show `READY`: `1/1` and `STATUS`: `Running`
**Lifecycle Events**
-- Each line represents an event: `Pending`, `ContainerCreating`, `Running` or `Completed`
-- Restarts should ideally be `0`; otherwise, there may be a resource problem (slow network, not enough CPU or memory, etc.) with your cluster, and Kubernetes is trying to self-heal
+- Each line represents an event: `Pending`, `ContainerCreating`, `Running` or `Completed`.
+- Restarts should ideally be `0`; otherwise, there may be a resource problem (slow network, not enough CPU or memory, etc.) with your cluster, and Kubernetes is trying to self-heal.
- This is a partial history for a typical install.
``` shell-session
NAME READY STATUS RESTARTS AGE
@@ -330,10 +332,10 @@ pn-3c07adf0-fac54a9f-entando-app-builder-menu-bff-deploymep6j87 1/1 Runnin
---
-The URL of your running Entando instance is http://YOUR-HOST-NAME/app-builder/.
+The URL of your running Entando instance is http://ingressHostName/app-builder/.
-- Example URL
+- Example URL:
``` bash
quickstart.192.168.64.33.nip.io/app-builder/
@@ -341,9 +343,9 @@ quickstart.192.168.64.33.nip.io/app-builder/
---
-## Login to Entando
+## Log in to Entando
-Now that you've installed Entando, login to the Entando App Builder.
+Now that you've installed Entando, log in to the Entando App Builder.
![entando-login.png](./img/entando-login.png)
@@ -368,8 +370,8 @@ Check out these resources to continue your journey with Entando!
* **Try a Tutorial:** Take advantage of the [Learning Paths](../../tutorials/), which organize a few of the most popular tutorials by user type.
-* **Dig Deeper into Entando Concepts:** Review the [Docs](../) sections to more deeply understand the Entando building blocks.
+* **Dig Deeper into Entando Concepts:** Review the [Docs](../) sections to get a better understanding of the Entando building blocks.
-* **Learn about the Quickstart Environment:** See the [Quickstart Tips](../reference/local-tips-and-tricks.md) for more information on how to manage your Getting Started or quickstart environment.
+* **Learn about the Quickstart Environment:** See the [Quickstart Tips](../reference/local-tips-and-tricks.md) for more information on how to manage and troublshoot your quickstart environment.
---
diff --git a/vuepress/docs/next/docs/getting-started/concepts-overview.md b/vuepress/docs/next/docs/getting-started/concepts-overview.md
index 9a7db53a94..8e2b3d99e4 100644
--- a/vuepress/docs/next/docs/getting-started/concepts-overview.md
+++ b/vuepress/docs/next/docs/getting-started/concepts-overview.md
@@ -1,89 +1,94 @@
# Entando Architecture Concepts
-Entando is an application composition platform that simplifies and accelerates enterprise modernization across on-prem and cloud infrastructures. It offers native support for Javascript app development, a micro frontend and microservice architecture, scalable app deployment, and automated container orchestration via Kubernetes.
+Entando is an application composition platform (ACP) that simplifies and accelerates enterprise modernization across on-prem and cloud infrastructures. It offers native support for Javascript app development, a micro frontend and microservice architecture, scalable deployments, and automated container orchestration via Kubernetes.
-This document explores the architecture of the Entando Platform and some notable runtime characteristics.
+This document explores the conceptual architecture of the Platform and its runtime characteristics.
![entando-architecture](./img/entando-architecture.png)
-- [Key Entando Concepts](#key-entando-concepts)
+- [Key Concepts](#key-concepts)
- [Entando Cluster Elements](#entando-cluster-elements)
- [Entando Ingresses](#entando-ingresses)
-> Note: A portal, website, web app, or mobile app built with Entando is called an Entando Application.
-An Entando Application is an assembly of out-of-the-box and/or custom-built components running on the
-Entando Platform. Entando components can be widgets, micro frontends, microservices, page templates, WCMS content or WCMS content types.
-## Key Entando Concepts
+## Key Concepts
+
+### Entando Application
+A portal, website, web app, or mobile app built with Entando is called an Entando Application.
+An Entando Application is an assembly of out-of-the-box and/or custom-built components, called bundles, running on the
+Platform. Applications also consist of page templates, WCMS content, content types, and other assets.
+
+### Entando Bundle
+An Entando Bundle is a packaged set of components and resources created for the Platform. They are the building blocks of any application built on Entando, consisting of micro frontends, microservices, services and other resources. The Entando Component Manager identifies and installs the bundles to the Local Hub.
+
+See also: [Bundle Details](../curate/bundle-details.md)
+
### Entando App Builder
-The [Entando App Builder](../compose/app-builder.md) is the frontend of the Entando Platform with which an Entando Application is created and customized. It hosts the Entando WCMS and provides a feature-rich, low-code user interface to configure and interact with components, design and create pages, manage content, and build modular applications.
+The [Entando App Builder](../compose/app-builder.md) is the application composer of the Platform. It hosts the WCMS and provides a feature-rich, low-code user interface to find and configure components, design and create pages, manage content, and build composable applications.
See also: [Widget Tutorial](../../tutorials/compose/widgets-fragments.md)
### Entando App Engine
-The Entando App Engine is the core runtime engine responsible for the primary out-of-the-box services required to develop Entando Applications. It exposes the backend APIs used to deliver the page and content management interface of an Entando Application, assembles and coordinates components within the Entando App Builder, and provides the data access layer to persist pages and application design.
+The Entando App Engine is the core runtime engine responsible for the primary out-of-the-box services required to develop applications. It exposes the backend APIs used to deliver the page and content management interface of an Entando Application, assembles and coordinates components within the App Builder, and provides the data access layer to persist pages and application design.
See also: [APIs tutorial](../consume/entando-apis.md)
### Entando Component Generator
-The Entando Component Generator implements a [JHipster](https://www.jhipster.tech/) blueprint to quickly and efficiently generate the skeleton of an Entando project using automation and templating. The generator provides advanced data modeling capabilities, including object relational mapping, and the autogeneration of micro frontends and microservices. The [Entando Blueprint](../../tutorials/create/ms/generate-microservices-and-micro-frontends.md) fast-tracks development by creating the folders, files and infrastructure required by a project.
+The Entando Component Generator implements a [JHipster](https://www.jhipster.tech/) blueprint to quickly generate the skeleton of an Entando bundle with automation and templating. The Generator provides advanced data modeling capabilities, including object relational mapping and dynamic creation of micro frontends and microservices.
-See also: [Component Generation Technologies](../create/component-gen-tech.md)
+See also: [Generate Microservices & Micro Frontends](../../tutorials/create/ms/generate-microservices-and-micro-frontends.md)
### Entando Identity Management System
-[Entando Identity Management System](../consume/identity-management.md) is Entando's [Keycloak](https://www.keycloak.org/)-based user management and authentication system. It applies Single Sign On capabilities across multiple domains to connect service providers with identity providers.
+[Entando Identity Management System](../consume/identity-management.md) is the Platform's [Keycloak](https://www.keycloak.org/)-based user management and authentication system. It applies Single Sign On capabilities across multiple domains to connect service providers with identity providers.
See also: [Entando Authentication](../../tutorials/create/mfe/authentication.md)
### Entando Local Hub
-The [Entando Local Hub](../compose/local-hub-overview.md) is the component repository of an Entando App Builder. The Entando Bundles available to the Entando Application are represented and can be deployed, installed, updated or versioned using the App Builder UI.
+The [Local Hub](../compose/local-hub-overview.md) is the component repository of the App Builder. Bundles--the basic building block for composing applications on Entando--are catalogued and organized here. The Local Hub also provides direct access to bundles in the Entando Marketplace and the Enterprise Hub, if one exists for the organization, and can be deployed and installed from here.
### Entando WCMS
-The Entando Web Content Management System (WCMS) is a lightweight content and digital asset management system. It manages widgets, HTML fragments, and other content types used in an Entando Application.
+The Entando Web Content Management System (WCMS) is a lightweight content and digital asset management system. It manages widgets, HTML fragments, and other content types for an Entando Application.
See also: [Content Types](../../tutorials/compose/content-types-tutorial), [Content Templates](../../tutorials/compose/content-templates-tutorial) and [Digital Assets](../../tutorials/compose/digital-assets-tutorial.md)
## Entando Cluster Elements
-The following is an overview of the elements comprising an Entando Cluster.
+The following is an overview of the elements comprising an Entando cluster.
### Architecture - Members of the Cluster
-Below is a diagram of an Entando Cluster and depicts how the various elements interact with one another. Entando deploys this infrastructure on Kubernetes using the Entando Operator and controllers. Each element is associated with a custom resource definition (CRD) file, if applicable.
+This is a diagram of an Entando cluster, depicting how the various elements interact with one another. Entando deploys this infrastructure on Kubernetes using the Entando Operator and controllers. Each element is associated with a custom resource definition (CRD) where applicable.
-![Entando Cluster Architecture Diagram](./img/entando-architecture-v1.5.svg)
+![Entando Cluster Architecture Diagram](./img/entando-cluster-arch.png)
#### EntandoApp
-The EntandoApp is comprised of the Entando App Builder, the Entando App Engine and the Entando Component Manager. Keycloak-based authorization and authentication enable these to interact with each other and other cluster elements.
+The EntandoApp is comprised of the App Builder, App Engine and Component Manager. Keycloak-based authorization and authentication enable these to interact with each other and other cluster elements.
+
+
#### Entando Component Manager
-The purpose of the [Entando Component Manager](../compose/ecm-overview.md) is to:
+The purpose of the [Entando Component Manager](../compose/ecm-overview.md) (ECM) is to:
- Provide the functionality to deploy and install micro frontends and widgets
- Manage the connections between an application and the installed microservices
-It integrates the Local Hub into the App Builder to list the Entando Bundles accessible from the EntandoApp, provisioning bundle management services such as install, uninstall, upgrade, downgrade and versioning. The Entando Kubernetes integration service communicates with the cluster to supply these bundle services and is the only service, other than the Entando Operator, that can interact with the cluster and custom resources.
+The ECM integrates the Local Hub into the App Builder, listing the bundles accessible from the EntandoApp, and managing their install, uninstall, upgrade, downgrade and tracking processes. The Entando Kubernetes integration service communicates with the cluster to supply these bundle services and is the only service, other than the Entando Operator, that can interact with the cluster and custom resources.
#### Entando Kubernetes Service
-The Entando Kubernetes integration service (`entando-k8s-service`) is a function of the Entando Cluster infrastructure custom resource, providing an abstraction layer between Entando microservices and the APIs exposed by Kubernetes. It supplies access points to several custom resources defined by Entando, in particular Entando Applications, Entando Plugins, Entando Bundles and Entando links.
+The Entando Kubernetes integration service (`entando-k8s-service`) is a function of the Entando cluster infrastructure custom resource, providing an abstraction layer between Entando microservices and the APIs exposed by Kubernetes. It supplies access points to several custom resources defined by Entando, in particular Entando Applications, plugins, bundles and links.
The `entando-k8s-service` is used to:
- Provide a list of the available Entando Bundles to the Entando Component Manager
- Deploy a microservice, or expose an already available microservice, during the installation of a bundle
- Create a link between an EntandoApp and an EntandoPlugin to expose microservice APIs to the EntandoApp and micro frontends
-#### Entando Bundle
-An Entando Bundle is a packaged set of components and resources created for the Entando Platform. The Entando Component Manager identifies the bundles and can install their components to extend the functionality of an Entando Application.
-
-See also: [Local Hub Overview](../compose/local-hub-overview.md)
-
#### Entando Plugin
-An Entando Plugin is a microservice that exposes APIs reusable by one or more Entando Applications. Plugin services are commonly accessible from micro frontends and can be quickly generated with the [Entando Blueprint](../../tutorials/create/ms/generate-microservices-and-micro-frontends.md). A blueprint-generated project can be used as-is in an Entando environment and provides Keycloak integration, a set of default micro frontends, and microservices exposed by the bundle.
+An Entando Plugin is a microservice that exposes APIs reusable by one or more Entando Applications. Plugin services are commonly accessible from micro frontends and can be quickly generated with the [Entando Blueprint](../../tutorials/create/ms/generate-microservices-and-micro-frontends.md). This blueprint-generated project is customizable and provides Keycloak integration, a set of default micro frontends, and microservices exposing APIs.
#### Keycloak
-Keycloak is responsible for authorization and authentication on Entando. All members of an Entando Cluster interact with Keycloak to verify user and service authorization.
+Keycloak is responsible for authorization and authentication. All members of an Entando cluster interact with Keycloak to verify users and service authorizations.
## Entando Ingresses
-An ingress is a Kubernetes resource that exposes HTTP and HTTPS paths from outside an Entando Cluster to services within it. Traffic routing is controlled by rules defined on the ingress resource.
+An ingress is a Kubernetes resource that exposes HTTP and HTTPS paths from outside a cluster to services within it. Traffic routing is controlled by rules defined in the ingress resource.
When deploying a cluster, ingresses are generated for the resources that must be exposed to external services. The Entando Operator and custom resource controllers create the ingresses and set the correct paths and certificates. Entando implements Keycloak and EntandoApp ingresses.
#### Keycloak Ingress
@@ -99,8 +104,8 @@ The EntandoApp ingress is also used to link a microservice with an EntandoApp wh
The table below lists the default paths exposed for each ingress.