Merge pull request #198258 from MicrosoftDocs/repo_sync_working_branch

v-alje · web-flow · commit fb432b0ede93 · 2022-05-17T09:40:07.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/azure-monitor/best-practices.md b/articles/azure-monitor/best-practices.md
@@ -12,7 +12,7 @@ This scenario provides recommended guidance for configuring features of Azure Mo
 
 Azure Monitor is available the moment you create an Azure subscription. The Activity log immediately starts collecting events about activity in the subscription, and platform metrics are collected for any Azure resources you created. Features such as metrics explorer are available to analyze data. Other features require configuration. This scenario identifies the configuration steps required to take advantage of all Azure Monitor features. It also makes recommendations for which features you should leverage and how to determine configuration options based on your particular requirements.
 
-Enabling Azure Monitor to monitor of all your Azure resources is a combination of configuring Azure Monitor components and configuring Azure resources to generate monitoring data for Azure Monitor to collect. The goal of a complete implementation is to collect all useful data from all of your cloud resources and applications and enable the entire set of Azure Monitor features based on that data.
+Enabling Azure Monitor to monitor all of your Azure resources is a combination of configuring Azure Monitor components and configuring Azure resources to generate monitoring data for Azure Monitor to collect. The goal of a complete implementation is to collect all useful data from all of your cloud resources and applications and enable the entire set of Azure Monitor features based on that data.
 
 
 > [!IMPORTANT]
diff --git a/articles/azure-vmware/includes/vmware-software-update-frequency.md b/articles/azure-vmware/includes/vmware-software-update-frequency.md
@@ -14,9 +14,9 @@ One benefit of Azure VMware Solution private clouds is the platform is maintaine
 
 Microsoft is responsible for applying any patches, updates, or upgrades to ESXi, vCenter, vSAN, and NSX-T in your private cloud. The impact of patches, updates, and upgrades on ESXi, vCenter, and NSX-T is different. 
 
-- **ESXi** - There's no impact to workloads running in your private cloud. Access to vCenter and NSX-T isn't blocked during this time.  It's recommended that, during this time, you don't plan any other activities like scaling up private cloud, and so on, in your private cloud.
+- **ESXi** - There's no impact to workloads running in your private cloud. Access to vCenter and NSX-T isn't blocked during this time.  It's recommended that, during this time, you don't plan any other activities like scaling up private cloud, scheduling or initiating active HCX migrations, making HCX configuration changes and so on, in your private cloud.
 
-- **vCenter** - There's no impact to workloads running in your private cloud. During this time, vCenter will be unavailable and you won't be able to manage VMs (stop, start, create, or delete). It's recommended that, during this time, you don't plan any other activities like scaling up private cloud, creating new networks, and so on, in your private cloud.
+- **vCenter** - There's no impact to workloads running in your private cloud. During this time, vCenter will be unavailable and you won't be able to manage VMs (stop, start, create, or delete). It's recommended that, during this time, you don't plan any other activities like scaling up private cloud, creating new networks, and so on, in your private cloud. If you are using SRM or vSphere replication user interfaces, it is recommended to not configure vSphere replications and configure or execute site recovery plans during the vCenter upgrade.
 
 - **NSX-T** - There's workload impact and when a particular host is being upgraded, the VMs on that host might lose connectivity from 2 seconds to maximum 1 minute with any and all of the following symptoms:
 
diff --git a/articles/container-apps/application-lifecycle-management.md b/articles/container-apps/application-lifecycle-management.md
@@ -26,7 +26,7 @@ As a container app is deployed, the first revision is automatically created.
 
 ## Update
 
-As a container app is updated with a [revision scope-change](revisions.md#revision-scope-changes), a new revision is created. You can choose whether to [automatically deactivate new old revisions, or allow them to remain available](revisions.md).
+As a container app is updated with a [revision scope-change](revisions.md#revision-scope-changes), a new revision is created. You can choose whether to [automatically deactivate old revisions, or allow them to remain available](revisions.md).
 
 :::image type="content" source="media/application-lifecycle-management/azure-container-apps-lifecycle-update.png" alt-text="Azure Container Apps: Update phase":::
 
diff --git a/articles/container-apps/github-actions-cli.md b/articles/container-apps/github-actions-cli.md
@@ -11,11 +11,11 @@ ms.author: cshoe
 
 # Publish revisions with GitHub Actions in Azure Container Apps Preview
 
-Azure Container Apps allows you to use GitHub Actions to publish [revisions](revisions.md) to your container app. As commits are pushed to your GitHub repository, a GitHub Action is triggered which updates the [container](containers.md) image in the container registry. Once the container is updated in the registry, Azure Container Apps creates a new revision based on the updated container image.
+Azure Container Apps allows you to use GitHub Actions to publish [revisions](revisions.md) to your container app. As commits are pushed to your GitHub repository, a GitHub Actions is triggered which updates the [container](containers.md) image in the container registry. Once the container is updated in the registry, Azure Container Apps creates a new revision based on the updated container image.
 
 :::image type="content" source="media/github-actions/azure-container-apps-github-actions.png" alt-text="Changes to a GitHub repo trigger an action to create a new revision.":::
 
-The GitHub action is triggered by commits to a specific branch in your repository. When creating the integration link, you decide which branch triggers the action.
+The GitHub Actions is triggered by commits to a specific branch in your repository. When creating the integration link, you decide which branch triggers the action.
 
 ## Authentication
 
diff --git a/articles/container-apps/scale-app.md b/articles/container-apps/scale-app.md
@@ -27,8 +27,9 @@ There are two scale properties that apply to all rules in your container app:
 - Individual scale rules are defined in the `rules` array.
 - If you want to ensure that an instance of your application is always running, set `minReplicas` to 1 or higher.
 - Replicas not processing, but that remain in memory are billed in the "idle charge" category.
-- Changes to scaling rules are a [revision-scope](./revisions.md#revision-scope-changes) change.
-- When using non-HTTP event scale rules, setting the `activeRevisionMode` to `single` is recommended.
+- Changes to scaling rules are a [revision-scope](overview.md) change.
+- When using non-HTTP event scale rules, setting the `properties.configuration.activeRevisionsMode` property of the container app to `single` is recommended.
+
 
 
 
diff --git a/articles/firewall/premium-certificates.md b/articles/firewall/premium-certificates.md
@@ -23,7 +23,7 @@ There are three types of certificates used in a typical deployment:
 
 - **Server Certificate (Website certificate)**
 
-   A certificate associated with to specific domain name. If a website has a valid certificate, it means that a certificate authority has taken steps to verify that the web address actually belongs to that organization. When you type a URL or follow a link to a secure website, your browser checks the certificate for the following characteristics:
+   A certificate associated with a specific domain name. If a website has a valid certificate, it means that a certificate authority has taken steps to verify that the web address actually belongs to that organization. When you type a URL or follow a link to a secure website, your browser checks the certificate for the following characteristics:
    - The website address matches the address on the certificate.
    - The certificate is signed by a certificate authority that the browser recognizes as a *trusted* authority.
    
diff --git a/articles/service-fabric/service-fabric-cluster-nodetypes.md b/articles/service-fabric/service-fabric-cluster-nodetypes.md
@@ -71,7 +71,7 @@ The following are the property descriptions:
 | type | "ServiceFabricLinuxNode" or "ServiceFabricWindowsNode" | Identifies OS Service Fabric is bootstrapping to |
 | autoUpgradeMinorVersion | true or false | Enable Auto Upgrade of SF Runtime Minor Versions |
 | publisher | Microsoft.Azure.ServiceFabric | Name of the Service Fabric extension publisher |
-| clusterEndpont | string | URI:PORT to Management endpoint |
+| clusterEndpoint | string | URI:PORT to Management endpoint |
 | nodeTypeRef | string | Name of nodeType |
 | durabilityLevel | bronze, silver, gold, platinum | Time allowed to pause immutable Azure Infrastructure |
 | enableParallelJobs | true or false | Enable Compute ParallelJobs like remove VM and reboot VM in the same scale set in parallel |
diff --git a/articles/static-web-apps/faq.yml b/articles/static-web-apps/faq.yml
@@ -33,9 +33,9 @@ sections:
       - question: |
           Can I customize the build process?
         answer: |
-          If you want complete control over how to build your app, you can configure your own build steps in your app's GitHub workflow or Azure DevOps pipeline. You can then use the Static Web Apps GitHub Action or Azure Pipelines task to deploy your app. Ensure that you set `skip_app_build` to `true`. To learn more, see [Build configuration](build-configuration.md?skip-building-front-end-app).
+          If you want complete control over how to build your app, you can configure your own build steps in your app's GitHub workflow or Azure DevOps pipeline. You can then use the Static Web Apps GitHub Actions or Azure Pipelines task to deploy your app. Ensure that you set `skip_app_build` to `true`. To learn more, see [Build configuration](build-configuration.md?skip-building-front-end-app).
 
-          The `skip_app_build` command is currently only supported for the frontend app. The API app must be built by the Azure Static Web Apps GitHub Action or Azure Pipelines task.
+          The `skip_app_build` command is currently only supported for the frontend app. The API app must be built by the Azure Static Web Apps GitHub Actions or Azure Pipelines task.
 
       - question: |
           Can I deploy my app without using GitHub Actions or Azure DevOps?
