Skip to content

Commit eb28836

Browse files
authored
Merge pull request #295419 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 9957932 + f777711 commit eb28836

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

articles/app-service/app-service-asp-net-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ __App Service Migration Assistant tool and App Service migration assistant for P
5757
|-----------|-------------|---------------|
5858
|[App Service Migration Assistant](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Migrate .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
5959
|[App Service migration assistant for Java on Apache Tomcat (Windows—preview)](https://appmigration.microsoft.com/api/download/windowspreview/AppServiceMigrationAssistant.msi)|Download prerelease software for migrating Java web applications on Tomcat web server running on Windows servers.|[App Service Migration Assistant Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki)|
60-
|[App Service Migration Assistant PowerShell scripts](https://appmigration.microsoft.com/api/download/psscripts/AppServiceMigrationScripts.zip)|Download PowerShell scripts for discovering and assessing all Microsoft Internet Information Services (IIS) web apps on a single server in bulk and migrating .NET web apps from Windows OS to App Service.|[App Service Migration Assistant Powershell Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts)<br>[SHA256 Identifier](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Release-Notes)|
60+
|[App Service Migration Assistant PowerShell scripts](https://appmigration.microsoft.com/api/download/psscripts/AppServiceMigrationScripts.zip)|Download PowerShell scripts for discovering and assessing all Microsoft Internet Information Services (IIS) web apps on a single server in bulk and migrating .NET web apps from Windows OS to App Service.|[App Service Migration Assistant PowerShell Documentation](https://github.com/Azure/App-Service-Migration-Assistant/wiki/PowerShell-Scripts)<br>[SHA256 Identifier](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Release-Notes)|
6161

6262
| More resources to migrate .NET apps to the cloud |
6363
|----------------|

articles/app-service/scripts/powershell-configure-ssl-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ This script uses the following commands. Each command in the table links to comm
5151

5252
For more information on the Azure PowerShell module, see [Azure PowerShell documentation](/powershell/azure/).
5353

54-
Additional Azure Powershell samples for Azure App Service Web Apps can be found in the [Azure PowerShell samples](../samples-powershell.md).
54+
Additional Azure PowerShell samples for Azure App Service Web Apps can be found in the [Azure PowerShell samples](../samples-powershell.md).

articles/databox/data-box-disk-deploy-copy-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Review the following considerations before you copy the data to the disks:
111111
- Only fixed VHDs can be uploaded to create managed disks. Dynamic VHDs, differencing VHDs, and VHDX files aren't supported.
112112
- The Data Box Disk Split Copy and Validation tools, `DataBoxDiskSplitCopy.exe` and `DataBoxDiskValidation.cmd`, report failures when long paths are processed. These failures are common when long paths aren't enabled on the client, and your data copy's paths and file names exceed 256 characters. To avoid these failures, follow the guidance within the [enable long paths on your Windows client](/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later) article.
113113
> [!IMPORTANT]
114-
> Powershell ISE is not supported for the Data Box Disk Tools
114+
> PowerShell ISE is not supported for the Data Box Disk Tools
115115
116116
Perform the following steps to connect and copy data from your computer to the Data Box Disk.
117117

articles/databox/data-box-disk-deploy-set-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Perform the following steps to connect and unlock your disks.
124124
2. Download the Data Box Disk toolset corresponding to the Windows client. This toolset contains 3 tools: Data Box Disk Unlock tool, Data Box Disk Validation tool, and Data Box Disk Split Copy tool.
125125

126126
> [!NOTE]
127-
> Powershell ISE is not supported for the Data Box Disk Tools
127+
> PowerShell ISE is not supported for the Data Box Disk Tools
128128
129129
This procedure requires only the Data Box Disk Unlock tool. The remaining tools will be used in subsequent steps.
130130

articles/governance/machine-configuration/whats-new/psdsc-in-machine-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ $null = Invoke-Command -ScriptBlock {
270270
}
271271
272272
try {
273-
# Set env variable to include Windows Powershell modules so we can find
273+
# Set env variable to include Windows PowerShell modules so we can find
274274
# the Get-WindowsFeature cmdlet.
275275
$env:PSModulePath = $WindowsPSModuleFolder
276276
# Call Windows PowerShell to get the info about the Web-Server feature

articles/sentinel/data-connectors/netskope.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ This method provides the step-by-step instructions to deploy the Netskope connec
109109
**1. Create a Function App**
110110

111111
1. From the Azure Portal, navigate to [Function App](https://portal.azure.com/#blade/HubsExtension/BrowseResource/resourceType/Microsoft.Web%2Fsites/kind/functionapp), and select **+ Add**.
112-
2. In the **Basics** tab, ensure Runtime stack is set to **Powershell Core**.
112+
2. In the **Basics** tab, ensure Runtime stack is set to **PowerShell Core**.
113113
3. In the **Hosting** tab, ensure the **Consumption (Serverless)** plan type is selected.
114114
4. Make other preferable configuration changes, if needed, then click **Create**.
115115

articles/sentinel/data-connectors/qualys-vulnerability-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Use the following step-by-step instructions to deploy the Quayls VM connector ma
117117
**1. Create a Function App**
118118

119119
1. From the Azure Portal, navigate to [Function App](https://portal.azure.com/#blade/HubsExtension/BrowseResource/resourceType/Microsoft.Web%2Fsites/kind/functionapp), and select **+ Add**.
120-
2. In the **Basics** tab, ensure Runtime stack is set to **Powershell Core**.
120+
2. In the **Basics** tab, ensure Runtime stack is set to **PowerShell Core**.
121121
3. In the **Hosting** tab, ensure the **Consumption (Serverless)** plan type is selected.
122122
4. Make other preferable configuration changes, if needed, then click **Create**.
123123

articles/sentinel/data-connectors/vmware-carbon-black-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Use the following step-by-step instructions to deploy the VMware Carbon Black co
115115
**1. Create a Function App**
116116

117117
1. From the Azure Portal, navigate to [Function App](https://portal.azure.com/#blade/HubsExtension/BrowseResource/resourceType/Microsoft.Web%2Fsites/kind/functionapp), and select **+ Add**.
118-
2. In the **Basics** tab, ensure Runtime stack is set to **Powershell Core**.
118+
2. In the **Basics** tab, ensure Runtime stack is set to **PowerShell Core**.
119119
3. In the **Hosting** tab, ensure the **Consumption (Serverless)** plan type is selected.
120120
4. Make other preferable configuration changes, if needed, then click **Create**.
121121

articles/update-manager/troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To review the logs related to all actions performed by the extension, check for
4444

4545
For Azure Arc-enabled servers, see [Troubleshoot VM extensions](/azure/azure-arc/servers/troubleshoot-vm-extensions) for general troubleshooting steps.
4646

47-
To review the logs related to all actions performed by the extension, on Windows, check for more information in `C:\ProgramData\GuestConfig\extension_Logs\Microsoft.SoftwareUpdateManagement\WindowsOsUpdateExtension`. It includes the following two log files of interest:
47+
To review the logs related to all actions performed by the extension, on Windows, check for more information in `C:\ProgramData\GuestConfig\extension_logs\Microsoft.SoftwareUpdateManagement.WindowsOsUpdateExtension`. It includes the following log files of interest:
4848

4949
* `WindowsUpdateExtension.log`: Contains information related to the patch actions. This information includes the patches assessed and installed on the machine and any problems encountered in the process.
5050
* `cmd_execution_<numeric>_stdout.txt`: There's a wrapper above the patch action. It's used to manage the extension and invoke specific patch operation. This log contains information about the wrapper. For autopatching, the log has information on whether the specific patch operation was invoked.

articles/virtual-wan/how-to-routing-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The following table provides example Virtual Network address space calculations.
126126
| Hub #2| 150 | 3 | 450| Request limit increase to use routing intent.|
127127
| Hub #3 |370 | 1| 370| Request limit increase.|
128128

129-
You can use the following Powershell script to approximate the number of address spaces in Virtual Networks connected to a single Virtual WAN hub. Run this script for all Virtual WAN hubs in your Virtual WAN. An Azure Monitor metric to allow you to track and configure alerts on connected Virtual Network address spaces is on the roadmap.
129+
You can use the following PowerShell script to approximate the number of address spaces in Virtual Networks connected to a single Virtual WAN hub. Run this script for all Virtual WAN hubs in your Virtual WAN. An Azure Monitor metric to allow you to track and configure alerts on connected Virtual Network address spaces is on the roadmap.
130130

131131
Make sure to modify the resource ID of the Virtual WAN Hub in the script to match your environment. If you have cross-tenant Virtual Network connections, make sure you have sufficient permissions to read the Virtual WAN Virtual Network connection object as well as the connected Virtual Network resource.
132132

0 commit comments

Comments
 (0)