Skip to content

Commit 9c90f4e

Browse files
authored
Merge pull request #204353 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 a252f34 + 6afb227 commit 9c90f4e

File tree

9 files changed

+34
-39
lines changed

9 files changed

+34
-39
lines changed

articles/active-directory-b2c/validation-technical-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Following example uses these validation technical profiles:
8686
```xml
8787
<ValidationTechnicalProfiles>
8888
<ValidationTechnicalProfile ReferenceId="login-NonInteractive" ContinueOnError="false" />
89-
<ValidationTechnicalProfile ReferenceId="REST-ReadProfileFromCustomertsDatabase" ContinueOnError="true" >
89+
<ValidationTechnicalProfile ReferenceId="REST-ReadProfileFromCustomersDatabase" ContinueOnError="true" >
9090
<Preconditions>
9191
<Precondition Type="ClaimsExist" ExecuteActionsIf="false">
9292
<Value>userType</Value>

articles/active-directory/fundamentals/road-to-the-cloud-implement.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ You can enrich user attributes in Azure AD to make more user attributes availabl
2424

2525
* App provisioning - The data source of app provisioning is Azure AD and necessary user attributes must be in there.
2626

27-
* Application authorization - Token issued by Azure AD can include claims generated from user attributes.
28-
29-
* Application can make authorization decision based on the claims in token.
27+
* Application authorization - Token issued by Azure AD can include claims generated from user attributes so that applications can make authorization decision based on the claims in token.
3028

3129
* Group membership population and maintenance - Dynamic groups enables dynamic population of group membership based on user attributes such as department information.
3230

articles/active-directory/fundamentals/road-to-the-cloud-posture.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The five states have exit criteria to help you determine where your environment
3434

3535
The content then provides more detailed guidance organized to help with intentional changes to people, process, and technology to:
3636

37-
* Establish Azure AD capabilities
37+
* Establish Azure AD footprint
3838

3939
* Implement a cloud-first approach
4040

@@ -101,7 +101,7 @@ In enterprise-sized organizations, IAM transformation, or even transformation fr
101101

102102
The transformation between the states is similar to moving locations:
103103

104-
* **Establish new location** - You purchase your destination and establish connectivity between the current location and the new location. This enables you to maintain your productivity and ability to operate. In this content, the activities are described in **[Establish Azure AD capabilities](road-to-the-cloud-establish.md)**. The results transition you to State 2.
104+
* **Establish new location** - You purchase your destination and establish connectivity between the current location and the new location. This enables you to maintain your productivity and ability to operate. In this content, the activities are described in **[Establish Azure AD footprint](road-to-the-cloud-establish.md)**. The results transition you to State 2.
105105

106106
* **Limit new items in old location** - You stop investing in the old location and set policy to stage new items in new location. In this content, the activities are described in **[Implement cloud-first approach](road-to-the-cloud-implement.md)**. The activities set the foundation to migrate at scale and reach State 3.
107107

@@ -122,7 +122,7 @@ As a migration of IAM to Azure AD is started, organizations must determine the p
122122

123123
:::image type="content" source="media/road-to-cloud-posture/road-to-the-cloud-migration.png" alt-text="Table depicting three major milestones that organizations move through when implementing an AD to Azure AD migration. These include Establish Azure AD capabilities, Implement cloud-first approach, and Move workloads to the cloud." border="false":::
124124

125-
## Establish Azure AD capabilities
125+
## Establish Azure AD footprint
126126

127127
* **Initialize tenant** - Create your new Azure AD tenant that supports the vision for your end-state deployment.
128128

articles/active-directory/hybrid/reference-connect-adconnectivitytools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: devx-track-azurepowershell
1414
---
1515
# Azure AD Connect: ADConnectivityTools PowerShell Reference
1616

17-
The following documentation provides reference information for the ADConnectivityTools.psm1 PowerShell Module that is included with Azure AD Connect.
17+
The following documentation provides reference information for the ADConnectivityTools PowerShell Module that is included with Azure AD Connect in `C:\Program Files\Microsoft Azure Active Directory Connect\Tools\ADConnectivityTool.psm1`.
1818

1919
## Confirm-DnsConnectivity
2020

articles/defender-for-iot/organizations/how-to-manage-device-inventory-for-organizations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ If you are under the impression that certain devices aren't actively communicati
171171

172172
If you have devices no longer in use, delete them from the device inventory so that they're no longer connected to Defender for IoT.
173173

174-
Devices must be inactive for 14 days or more in order for you to be able to delete them.
175-
176174
**To delete a device**:
177175

178176
In the **Device inventory** page, select the device you want to delete, and then select **Delete** :::image type="icon" source="media/how-to-manage-device-inventory-on-the-cloud/delete-device.png" border="false"::: in the toolbar at the top of the page.

articles/security/fundamentals/antimalware-code-samples.md

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ The code sample below shows how you can add Microsoft Antimalware for Azure Arc-
182182
183183
```powershell
184184
#Before using Azure PowerShell to manage VM extensions on your hybrid server managed by Azure Arc-enabled servers, you need to install the Az.ConnectedMachine module. Run the following command on your Azure Arc-enabled server:
185+
#If you have Az.ConnectedMachine installed, please make sure the version is at least 0.4.0
185186
install-module -Name Az.ConnectedMachine
186187
Import-Module -name Az.ConnectedMachine
187188
@@ -192,36 +193,34 @@ $resourceGroupName = " RESOURCE GROUP NAME HERE "
192193
$machineName = "MACHINE NAME HERE "
193194
194195
# Enable Antimalware with default policies
195-
$settingString = {"AntimalwareEnabled": true}’;
196+
$setting = @{"AntimalwareEnabled"=$true}
196197
# Enable Antimalware with custom policies
197-
# $settingString = ‘{
198-
# "AntimalwareEnabled": true,
199-
# "RealtimeProtectionEnabled": true,
200-
# "ScheduledScanSettings": {
201-
# "isEnabled": true,
202-
# "day": 0,
203-
# "time": 120,
204-
# "scanType": "Quick"
205-
# },
206-
# "Exclusions": {
207-
# "Extensions": ".ext1,.ext2",
208-
# "Paths":"",
209-
# "Processes":"sampl1e1.exe, sample2.exe"
210-
# },
211-
# "SignatureUpdates": {
212-
# "FileSharesSources": “”,
213-
# "FallbackOrder”: “”,
214-
# "ScheduleDay": 0,
215-
# "UpdateInterval": 0,
216-
# },
217-
# "CloudProtection": true
218-
#
219-
# }’;
220-
198+
$setting2 = @{
199+
"AntimalwareEnabled"=$true;
200+
"RealtimeProtectionEnabled"=$true;
201+
"ScheduledScanSettings"= @{
202+
"isEnabled"=$true;
203+
"day"=0;
204+
"time"=120;
205+
"scanType"="Quick"
206+
};
207+
"Exclusions"= @{
208+
"Extensions"=".ext1, .ext2";
209+
"Paths"="";
210+
"Processes"="sampl1e1.exe, sample2.exe"
211+
};
212+
"SignatureUpdates"= @{
213+
"FileSharesSources"=“”;
214+
"FallbackOrder”=“”;
215+
"ScheduleDay"=0;
216+
"UpdateInterval"=0;
217+
};
218+
"CloudProtection"=$true
219+
}
221220
# Will be prompted to login
222221
Connect-AzAccount
223222
# Enable Antimalware with the policies
224-
New-AzConnectedMachineExtension -Name "IaaSAntimalware" -ResourceGroupName $resourceGroupName -MachineName $machineName -Location $location -SubscriptionId $subscriptionid -Publisher “Microsoft.Azure.Security” -Settings $settingString -ExtensionType “IaaSAntimalware”
223+
New-AzConnectedMachineExtension -Name "IaaSAntimalware" -ResourceGroupName $resourceGroupName -MachineName $machineName -Location $location -SubscriptionId $subscriptionid -Publisher “Microsoft.Azure.Security” -Settings $setting -ExtensionType “IaaSAntimalware”
225224
```
226225

227226
## Next steps

articles/service-connector/tutorial-django-webapp-postgres-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ The resource group, app name, db name are drawn from the cached values. You need
334334

335335
::: zone pivot="postgres-flexible-server"
336336
```azurecli
337-
az webapp connection create postgres --client-type django
337+
az webapp connection create postgres-flexible --client-type django
338338
```
339339

340340
The resource group, app name, db name are drawn from the cached values. You need to provide admin password of your postgres database during the execution of this command.

articles/virtual-machines/extensions/agent-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ When logged in to a Windows VM, Task Manager can be used to examine running proc
125125
The Azure VM Agent for Windows is automatically upgraded on images deployed from the Azure Marketplace. The new versions are stored in Azure Storage, so please ensure you don't have firewalls blocking access. As new VMs are deployed to Azure, they receive the latest VM agent at VM provision time. If you have installed the agent manually or are deploying custom VM images you will need to manually update to include the new VM agent at image creation time.
126126

127127
## Windows Guest Agent Automatic Logs Collection
128-
Windows Guest Agent has a feature to automatically collect some logs. This feature is controller by the CollectGuestLogs.exe process.
128+
Windows Guest Agent has a feature to automatically collect some logs. This feature is controlled by the CollectGuestLogs.exe process.
129129
It exists for both PaaS Cloud Services and IaaS Virtual Machines and its goal is to quickly & automatically collect some diagnostics logs from a VM - so they can be used for offline analysis.
130130
The collected logs are Event Logs, OS Logs, Azure Logs and some registry keys. It produces a ZIP file that is transferred to the VM’s Host. This ZIP file can then be looked at by Engineering Teams and Support professionals to investigate issues on request of the customer owning the VM.
131131

articles/virtual-machines/vm-naming-conventions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This page outlines the naming conventions used for Azure VMs. VMs use these nami
2626
| *Sub-family | Used for specialized VM differentiations only|
2727
| # of vCPUs| Denotes the number of vCPUs of the VM |
2828
| *Constrained vCPUs| Used for certain VM sizes only. Denotes the number of vCPUs for the [constrained vCPU capable size](./constrained-vcpu.md) |
29-
| Additive Features | One or more lower case letters denote additive features, such as: <br> a = AMD-based processor <br> b = Block Storage performance <br> d = diskful (i.e., a local temp disk is present); this is for newer Azure VMs, see [Ddv4 and Ddsv4-series](./ddv4-ddsv4-series.md) <br> i = isolated size <br> l = low memory; a lower amount of memory than the memory intensive size <br> m = memory intensive; the most amount of memory in a particular size <br> t = tiny memory; the smallest amount of memory in a particular size <br> s = Premium Storage capable, including possible use of [Ultra SSD](./disks-types.md#ultra-disks) (Note: some newer sizes without the attribute of s can still support Premium Storage e.g. M128, M64, etc.)<br> |
29+
| Additive Features | One or more lower case letters denote additive features, such as: <br> a = AMD-based processor <br> b = Block Storage performance <br> c = confidential <br> d = diskful (i.e., a local temp disk is present); this is for newer Azure VMs, see [Ddv4 and Ddsv4-series](./ddv4-ddsv4-series.md) <br> i = isolated size <br> l = low memory; a lower amount of memory than the memory intensive size <br> m = memory intensive; the most amount of memory in a particular size <br> t = tiny memory; the smallest amount of memory in a particular size <br> s = Premium Storage capable, including possible use of [Ultra SSD](./disks-types.md#ultra-disks) (Note: some newer sizes without the attribute of s can still support Premium Storage e.g. M128, M64, etc.)<br> NP = node packing <br> P = ARM Cpu <br>|
3030
| *Accelerator Type | Denotes the type of hardware accelerator in the specialized/GPU SKUs. Only the new specialized/GPU SKUs launched from Q3 2020 will have the hardware accelerator in the name. |
3131
| Version | Denotes the version of the VM Family Series |
3232

0 commit comments

Comments
 (0)