Updated Cloud docs to reflect changes coming with Flexible Environments

umbraco-cloud/README.md

@@ -34,7 +34,7 @@ The easiest way to start with an Umbraco Cloud project is to take a [14-day free
 
 Since everything is already set up for you, it is recommended that you get to know your project before you start building.
 
-To start working with and building your site, you can either work directly in the backoffice on the Cloud environment or [clone down the project to your local machine](set-up/working-locally.md).
+You can either work directly in the backoffice on the Cloud environment or [clone down the project to your local machine](set-up/working-locally.md).
 
 ### Umbraco Cloud Portal Project
 

umbraco-cloud/SUMMARY.md

@@ -81,7 +81,6 @@
 
 ## Deployments
 
-* [Streamline Your Deployments](deployment/streamline-your-deployments.md)
 * [Deployment](deployment/README.md)
 * [Deploying between environments](deployment/cloud-to-cloud.md)
 * [Transferring Content, Media, Members, and Forms](deployment/content-transfer.md)
@@ -132,6 +131,7 @@
   * [Extraction error: Config transforms failing](troubleshooting/deployments/changes-not-being-applied.md)
   * [Extraction error: Data Type collisions](troubleshooting/deployments/colliding-datatypes.md)
   * [Dependency Exception](troubleshooting/deployments/dependency-exceptions.md)
+  * [Merge Conflicts on Flexible Environments](troubleshooting/deployments/merge-conflicts-on-flexible-environments.md)
   * [Troubleshooting deployments failing with no error message](troubleshooting/deployments/deployment-failed.md)
   * [Troubleshooting duplicate dictionary items](troubleshooting/deployments/duplicate-dictionary-items.md)
   * [Troubleshooting language mismatches](troubleshooting/deployments/language-mismatch.md)

umbraco-cloud/databases/README.md

@@ -1,7 +1,7 @@
 # Working with databases
 
 {% hint style="info" %}
-The databases on your Umbraco Cloud environments are specific to their environment. This means that no matter what you have configured in the `connectionstring` in your `web.config` or `appSettings.json` file, we overwrite the connectionstring to use the SQL Azure Server we provide.
+The databases on your Umbraco Cloud environments are specific to their environment. This means that the connectionstring to use the SQL Azure Server is overwritten no matter what else is configured.
 {% endhint %}
 
 When working with Umbraco Cloud, the way you work with databases might differ from what you're used to. One important aspect of Umbraco Cloud is that you always work isolated to avoid interfering with colleagues or a running website. This includes the database as well.

umbraco-cloud/databases/backups.md

@@ -79,9 +79,6 @@ Once you have uploaded a backup, you might want to restore it to one of your env
 
     <figure><img src="../.gitbook/assets/image (72).png" alt="Choose which environment to restore the backup on"><figcaption><p>Choose which environment to restore the backup on</p></figcaption></figure>
 
-
-
-
 3. **Optional:** Create a Cloud Backup of the selected environment's database before restoring the backup.
 4. Click **"Restore backup"**
 
@@ -93,10 +90,10 @@ Make sure to check your environment and see if everything works as expected and
 
 Use the following steps:
 
-* Connect to your SQL Server using SQL Server Management Studio (SSMS).
-* Expand "Databases", right-click "Databases", then select "Import Data-tier Application...".
-* Proceed through the dialog, by browsing to the saved location of your `bacpac` file, and then setting the options appropriate to your configuration
-* Complete the import dialog and the database will be restored.
+1. Connect to your SQL Server using SQL Server Management Studio (SSMS).
+2. Expand "Databases", right-click "Databases", then select "Import Data-tier Application...".
+3. Proceed through the dialog, by browsing to the saved location of your `bacpac` file, and then setting the options appropriate to your configuration
+4. Complete the import dialog and the database will be restored.
 
 {% hint style="info" %}
 If a `bacpac` restore fails in SQL server, ensure the 'Contained Database Authentication' flag is set to true for resolution.

umbraco-cloud/deployment/README.md

@@ -6,29 +6,32 @@ description: >-
 
 # Deployment
 
-Umbraco Cloud uses a deployment model based on Git, Kudu, and Umbraco Deploy core technology to move changes between environments. This follows a "left to right" model. Changes start in the local or left-most environment and are deployed to the production environment.
+Umbraco Cloud uses a deployment model based on Git, Kudu, and Umbraco Deploy to move changes between environments. This follows a left-to-right deployment approach. Changes start in the local or left-most environment and are deployed to the production/Live environment. This workflow is called the mainline.
 
-![Left to right model](images/left-to-right.png)
+The mainline environments are used when building and deploying the initial website. Upgrades, both manual and automatic also go through the mainline environments.
 
-## Deployment Approach
+Flexible environments can be used to work on features separate from the mainline. This is done without interfering with upgrades or other changes being worked on in the mainline.
+
+![Left to right model](images/left-to-right-approach.png)
 
-Umbraco Cloud separates metadata and content during deployment. Metadata includes Document Types, Templates, Forms, Views, and config files. Content includes content items and media.
+## Deployment Approach
 
-**Key Terms:**
+Umbraco Cloud separates schema and content during deployment. Schema includes Document Types, Templates, Forms, Views, and config files. Content includes content items and media.
 
-* **Deploy:** Moves metadata between environments using a Git client or the Umbraco Cloud Portal.
-* **Transfer:** Moves content and media directly via the Umbraco backoffice.
+* **Deploy:** Moves schema between environments using a Git client or the Umbraco Cloud Portal.
+* **Transfer:** Move content and media directly via the Umbraco backoffice.
 
-**Deployment Types:**
+### Types of Deployments
 
-* **Metadata Deployment:** Metadata, including Document Types, Templates, Forms, Views, and config files, is stored in a Git repository. These are **deployed** between environments using a Git client or the Umbraco Cloud Portal.
-* **Content and Media Transfer:** Content and Media items are **not** stored in the Git repository. Instead, they must be **transferred** directly from the Umbraco backoffice using the **Queue for Transfer** option. Once all required items are queued, the **Deployment** Dashboard in the **Content** section is used to complete the transfer.
+| Schema Deployments | Content and Media Transfers |
+| ----------- | ------------- |
+| Schema is stored in a Git repository. These are **deployed** between environments using a Git client or the Umbraco Cloud Portal. | Content and Media items are not stored in the Git repository. They must be **transferred** directly from the Umbraco backoffice using the **Queue for Transfer** option. Once queued, use the **Deployment** Dashboard in the **Content** section to complete the transfer. |
 
-Content editors do not need Umbraco Cloud Portal access. They can manage content through the backoffice, while developers handle metadata deployments via Git.
+Content editors do not need Umbraco Cloud Portal access. They can manage content through the backoffice, while developers handle schema deployments via Git.
 
-### Deploying Metadata
+### Deploying Schema
 
-The source and target environments must be in sync before transferring content and media. Deploy metadata first to ensure consistency.
+The source and target environments must be in sync before transferring content and media. Deploy schema first to ensure consistency.
 
 * [Deploy changes from Local to Cloud](local-to-cloud.md)
 * [Deploy changes between Cloud environments](cloud-to-cloud.md)
@@ -56,7 +59,7 @@ Some deployments can trigger an Umbraco Cloud environment to restart. The table
 | Action:                             | Application Restart? |
 | ----------------------------------- | -------------------- |
 | Config file change                  | Yes                  |
-| Metadata deployment                 | No                   |
+| Schema deployment                   | No                   |
 | File change (for example, CSS file) | No                   |
 | Content or Media transfer           | No                   |
 
@@ -79,4 +82,3 @@ The `name` attribute in the `umbraco-cloud.json` can be updated to clarify deplo
 ![clone dialog](images/change-env-name-v8.png)
 
 ***
-

umbraco-cloud/deployment/cloud-to-cloud.md

@@ -2,36 +2,55 @@
 updatedLinks: true
 ---
 
-# Deploying between environments
+# Deploying between Environments
 
-When your are Working in your Development environment, changes made through the Backoffice are automatically detected and committed to the site's Git repository. This includes Umbraco-specific items like Document types and templates.
+When you are working in your Cloud environment, changes made through the Backoffice are automatically detected and committed to the site's Git repository. This includes Umbraco-specific items like Document Types and Templates. These changes are also referred to as metadata.
 
-Changes made on your Cloud environments will show up in the Umbraco Cloud portal. You'll be able to see what files have been added/changed and who made the changes.
+## Deploying between Mainline Environments
 
-To deploy metadata changes from one Cloud environment to another, click the **'Deploy changes to ..'** button on the environment where the changes have been made.
+Changes made in your Cloud environments will appear in the Umbraco Cloud portal. You can see what files have been added or changed and who made the changes.
+
+To deploy metadata changes from one Cloud environment to another, click the **Deploy changes** button on the environment where the changes were made.
 
 <figure><img src="../.gitbook/assets/image (39).png" alt=""><figcaption></figcaption></figure>
 
-The deployment initiates, and you can see the process in the **Overview of your project.**
+The deployment starts, and you can follow the progress in the **Overview** section of your project.
 
 <figure><img src="../.gitbook/assets/image (41).png" alt="Deployment in progress"><figcaption><p>Deployment in progress</p></figcaption></figure>
 
-Once it's done, the changes will be deployed to the next Cloud environment. If you have more Cloud environments, follow the same procedure to deploy the changes up to your Live site.
+Once complete, the changes are deployed to the next Cloud environment in the deployment flow. If you have additional environments, repeat this process to deploy the changes through each environment.
+
+## Syncing Changes Between Mainline and Flexible Environment
+
+When working with a flexible environment alongside your mainline environments, it's important to keep them aligned to avoid conflicts and ensure consistent deployments.
+
+If any changes have been made in a mainline environment those changes must be pulled into the flexible environment before pushing updates back. The changes can be updated Document Types, content, or other schema changes.
+
+![Pull changes from Mainline Environment](images/pull-changes-from-mainline.png)
+
+If what you've been working on in the flexible environment has also been changed in the mainline, a merge conflict will occur. These conflicts need to be resolved before you can continue with the deployment. For information on how to resolve them, see the [Merge Conflicts on Flexible Environments](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) article.
+
+Once you’ve completed your feature or update in the flexible environment and it’s synced with the latest mainline changes:
+
+* Push your changes from the flexible environment to the mainline environment.
+* From there, the changes become part of the regular deployment flow.
+
+![Push changes to the Mainline Environment](images/push-changes-to-mainline.png)
 
 ## Important Notes
 
-When you deploy, for example, from your Development environment to your Live environment, changes are made to the Live environment. These changes will then be merged back into the Development environment.
+When you deploy, for example, from your left-most mainline environment to your Live environment, changes are made to the Live environment. These changes will then be merged back into the left-most mainline environment.
 
-Here are the automatic steps Umbraco Cloud goes through when you hit the _"Deploy changes to .."_ button:
+Here are the automatic steps Umbraco Cloud goes through when you hit the _"Deploy changes"_ button:
 
 * Before pushing your changes from the source environment, the engine running Umbraco Cloud - **Umbraco Deploy** - looks for changes in the repository on the target environment
 * If changes are found, Umbraco Deploy _merges_ the changes from the target environment into the repository on the source environment.
 * After the merge, the changes from the source environment are pushed to the repository on the target environment.
 * Finally, the changes pushed to the target repository are extracted to the site, and you will now see your changes reflected in the Backoffice and on the Frontend.
 
-If you have more than one Umbraco Cloud environment, we strongly recommend that you **only make changes to metadata on the Development environment**. Making changes directly on your Staging and/or Live environments can cause merge conflicts when you deploy from your Development environment.
+It is recommended that you **only make changes to metadata on the left-most mainline environment or a flexible environment**. Making changes directly on other mainline environments can cause merge conflicts when you deploy.
 
-{% hint style="danger" %}
+{% hint style="warning" %}
 It is important to be aware of how deletions work between environments. Some deletions are environment-specific and others are not. For more information see the [Deploying Deletions article](deploying-deletions.md).
 {% endhint %}