Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 98db87f

Browse files
Barny ShergoldBarny Shergoldmeker12
authored
Correct number of Integration environments (#8087)
Co-authored-by: Barny Shergold <[email protected]> Co-authored-by: Margaret Eker <[email protected]>
1 parent 24199f6 commit 98db87f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/cloud/architecture/cloud-architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For comparison, each plan includes the following infrastructure features and sup
5555
<li>
5656
<a href="{{ site.baseurl }}/cloud/project/new-relic.html">New Relic</a> Infrastructure on Production + APM (Performance Monitoring) on Staging and Production. The <a href="{{ site.baseurl }}/cloud/project/new-relic.html#monitor-performance-with-managed-alerts">Managed alerts for {{ site.data.var.ee }} policy</a> implements monitoring best practices to proactively notify you about application and infrastructure issues affecting site performance.
5757
</li>
58-
<li>Platform-as-a-service (PaaS) based Integration development environments (8 total active environments) optimized for {{site.data.var.ee}}</li>
58+
<li>Platform-as-a-service (PaaS) based Integration development environments (2 total active environments) optimized for {{site.data.var.ee}}</li>
5959
<li>Infrastructure-as-a-Service (IaaS)—dedicated virtual infrastructure for Production environments and for Staging environments</li>
6060
</ul>
6161
</td>
@@ -107,6 +107,6 @@ The [Starter plan architecture]({{ site.baseurl }}/cloud/architecture/starter-ar
107107
The [Pro plan architecture]({{ site.baseurl }}/cloud/architecture/pro-architecture.html) has a global master with three environments:
108108

109109
- **Integration**—The Integration environment provides a testable environment that includes a database, web server, caching, some services, environment variables, and configurations. You can develop, deploy, and test your code before merging to the Staging environment.
110-
- _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment.
110+
- _Inactive_—You can have an unlimited number of inactive branches based on the Integration environment, but only one active branch (not including Integration itself).
111111
- **Staging**—The Staging environment is for pre-Production testing and includes a database, web server, caching, third-party services, environment variables, configurations, and services, such as Fastly.
112112
- **Production**—The Production environment includes a three-node, high-availability architecture for your data, services, caching, and store. This is your live, public store environment with environment variables, configurations, and third-party services.

src/cloud/live/stage-prod-live.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For detailed information of the process, see [Starter Develop and Deploy Workflo
3131

3232
## Pro plan deployment {#pro}
3333

34-
Pro comes with a large Integration environment with eight active branches and environments including `master`, Staging, and Production. When you create your project, code is ready to branch, develop, and push for building and deploying your site. Although the Integration environment can have many branches, Staging and Production have only one branch: the deployed Git `master`.
34+
Pro comes with a large Integration environment with two active branches and environments including `master`, Staging, and Production. When you create your project, code is ready to branch, develop, and push for building and deploying your site. Although the Integration environment can have many branches, Staging and Production have only one branch: the deployed Git `master`.
3535

3636
1. Create development branches from the Integration `master` branch.
3737
1. Develop on local: custom modules, Magento extensions, 3rd party integrations, and configurations.

0 commit comments

Comments
 (0)