From e1aa63b9f2fcfd72eb472f9e8c8a776362edad3c Mon Sep 17 00:00:00 2001 From: Lydia Date: Tue, 30 Nov 2021 15:02:44 -0800 Subject: [PATCH] ENDOC-385 Resolve conflict --- vuepress/docs/next/docs/reference/local-tips-and-tricks.md | 2 +- vuepress/docs/v6.3.2/docs/reference/local-tips-and-tricks.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vuepress/docs/next/docs/reference/local-tips-and-tricks.md b/vuepress/docs/next/docs/reference/local-tips-and-tricks.md index 5c47dbb01e..cabddf2c48 100644 --- a/vuepress/docs/next/docs/reference/local-tips-and-tricks.md +++ b/vuepress/docs/next/docs/reference/local-tips-and-tricks.md @@ -7,7 +7,7 @@ We've collected a list of tips and tricks to optimize your local quickstart or [ practices over on the [Entando forum](https://forum.entando.org). ## Quickstart Management -Here are a few common questions about the quickstart environment, which uses Multipass to launch an Ubuntu VM, install K3s Kubernetes, and then deploy Entando. +Here are a few common questions about the quickstart environment. The quickstart environment uses Multipass to launch an Ubuntu VM, where K3s Kubernetes is then installed and from which Entando is deployed. ### General **Q: How can I remove a quickstart environment?** diff --git a/vuepress/docs/v6.3.2/docs/reference/local-tips-and-tricks.md b/vuepress/docs/v6.3.2/docs/reference/local-tips-and-tricks.md index da1e00bafa..1272392cc7 100644 --- a/vuepress/docs/v6.3.2/docs/reference/local-tips-and-tricks.md +++ b/vuepress/docs/v6.3.2/docs/reference/local-tips-and-tricks.md @@ -7,7 +7,7 @@ We've collected a list of tips and tricks to optimize your local quickstart or [ practices over on the [Entando forum](https://forum.entando.org). ## Quickstart Management -Here are a few common questions about the quickstart environment, which uses Multipass to launch an Ubuntu VM, install K3s Kubernetes, and then deploy Entando. +Here are a few common questions about the quickstart environment. The quickstart environment uses Multipass to launch an Ubuntu VM, where K3s Kubernetes is then installed and from which Entando is deployed. ### General **Q: How can I remove a quickstart environment?**