Skip to content

Commit bdb6e0c

Browse files
authored
Merge pull request #191497 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 d193bee + 0b3d1eb commit bdb6e0c

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

articles/active-directory-b2c/quickstart-web-app-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ In this quickstart, you use an ASP.NET application to sign in using a social ide
3131
git clone https://github.com/Azure-Samples/active-directory-b2c-dotnet-webapp-and-webapi.git
3232
```
3333
34-
There are two projects are in the sample solution:
34+
There are two projects in the sample solution:
3535
3636
- **TaskWebApp** - A web application that creates and edits a task list. The web application uses the **sign-up or sign-in** user flow to sign up or sign in users.
3737
- **TaskService** - A web API that supports the create, read, update, and delete task list functionality. The web API is protected by Azure AD B2C and called by the web application.

articles/active-directory-domain-services/network-considerations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ As you design the virtual network for Azure AD DS, the following considerations
4242
4343
A managed domain connects to a subnet in an Azure virtual network. Design this subnet for Azure AD DS with the following considerations:
4444

45-
* A managed domain must be deployed in its own subnet. Don't use an existing subnet or a gateway subnet.
45+
* A managed domain must be deployed in its own subnet. Don't use an existing subnet or a gateway subnet. This includes the usage of remote gateways settings in the virtual network peering which puts the managed domain in an unsupported state.
4646
* A network security group is created during the deployment of a managed domain. This network security group contains the required rules for correct service communication.
4747
* Don't create or use an existing network security group with your own custom rules.
4848
* A managed domain requires 3-5 IP addresses. Make sure that your subnet IP address range can provide this number of addresses.
@@ -188,4 +188,4 @@ For more information about some of the network resources and connection options
188188

189189
* [Azure virtual network peering](../virtual-network/virtual-network-peering-overview.md)
190190
* [Azure VPN gateways](../vpn-gateway/vpn-gateway-about-vpn-gateway-settings.md)
191-
* [Azure network security groups](../virtual-network/network-security-groups-overview.md)
191+
* [Azure network security groups](../virtual-network/network-security-groups-overview.md)

articles/api-management/api-management-cross-domain-policies.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ Use the `cross-domain` policy to make the API accessible from Adobe Flash and Mi
4040

4141
```xml
4242
<cross-domain>
43+
<cross-domain-policy>
4344
<allow-http-request-headers-from domain='*' headers='*' />
45+
</cross-domain-policy>
4446
</cross-domain>
4547
```
4648

@@ -54,7 +56,7 @@ Use the `cross-domain` policy to make the API accessible from Adobe Flash and Mi
5456
This policy can be used in the following policy [sections](./api-management-howto-policies.md#sections) and [scopes](./api-management-howto-policies.md#scopes).
5557

5658
- **Policy sections:** inbound
57-
- **Policy scopes:** all scopes
59+
- **Policy scopes:** global
5860

5961
## <a name="CORS"></a> CORS
6062
The `cors` policy adds cross-origin resource sharing (CORS) support to an operation or an API to allow cross-domain calls from browser-based clients.

articles/defender-for-cloud/defender-for-container-registries-cicd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ To enable vulnerability scans of images in your GitHub workflows:
8989
subscription-token: ${{ secrets.AZ_SUBSCRIPTION_TOKEN }}
9090
```
9191
92-
1. Run the workflow that will push the image to the selected container registry. Once the image is pushed into the registry, a scan of the registry runs and you can view the CI/CD scan results along with the registry scan results within Microsoft Defender for Cloud.
92+
1. Run the workflow that will push the image to the selected container registry. Once the image is pushed into the registry, a scan of the registry runs and you can view the CI/CD scan results along with the registry scan results within Microsoft Defender for Cloud. Running the above YAML file will install an instance of Aqua Security's [Trivy](https://github.com/aquasecurity/trivy) in your build system. Trivy is licensed under the Apache 2.0 License and has dependencies on data feeds, many of which contain their own terms of use.
9393
9494
1. [View CI/CD scan results](#view-cicd-scan-results).
9595

articles/defender-for-cloud/defender-for-containers-introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ The **Azure Policy add-on for Kubernetes** collects cluster and workload configu
7979

8080
| Pod Name | Namespace | Kind | Short Description | Capabilities | Resource limits | Egress Required |
8181
|--|--|--|--|--|--|--|
82-
| azuredefender-collector-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment. | SYS_ADMIN, <br>SYS_RESOURCE, <br>SYS_PTRACE | memory: 64Mi<br> <br> cpu: 60m | No |
82+
| azuredefender-collector-ds-* | kube-system | [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment. | SYS_ADMIN, <br>SYS_RESOURCE, <br>SYS_PTRACE | memory: 64Mi<br> <br> cpu: 60m | No |
8383
| azuredefender-collector-misc-* | kube-system | [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) | A set of containers that focus on collecting inventory and security events from the Kubernetes environment that aren't bounded to a specific node. | N/A | memory: 64Mi <br> <br>cpu: 60m | No |
84-
| azuredefender-publisher-ds-* | kube-system | [DeamonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | Publish the collected data to Microsoft Defender for Containers' backend service where the data will be processed for and analyzed. | N/A | memory: 64Mi  <br> <br> cpu: 60m | Https 443 <br> <br> Learn more about the [outbound access prerequisites](../aks/limit-egress-traffic.md#microsoft-defender-for-containers) |
84+
| azuredefender-publisher-ds-* | kube-system | [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | Publish the collected data to Microsoft Defender for Containers' backend service where the data will be processed for and analyzed. | N/A | memory: 200Mi  <br> <br> cpu: 60m | Https 443 <br> <br> Learn more about the [outbound access prerequisites](../aks/limit-egress-traffic.md#microsoft-defender-for-containers) |
8585

8686
\* resource limits aren't configurable
8787

articles/firewall/remote-work-support.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Azure Firewall is a managed, cloud-based network security service that protects
1717

1818
Work from home policies requires many IT organizations to address fundamental changes in capacity, network, security, and governance. Employees aren't protected by the layered security policies associated with on-premises services while working from home. Virtual Desktop Infrastructure (VDI) deployments on Azure can help organizations rapidly respond to this changing environment. However, you need a way to protect inbound/outbound Internet access to and from these VDI deployments. You can use Azure Firewall [DNAT rules](rule-processing.md) along with its [threat intelligence](threat-intel.md) based filtering capabilities to protect your VDI deployments.
1919

20-
## Azure Windows Virtual Desktop support
20+
## Azure Virtual Desktop support
2121

22-
Windows Virtual Desktop is a comprehensive desktop and app virtualization service running in Azure. It’s the only virtual desktop infrastructure (VDI) that delivers simplified management, multi-session Windows 10, optimizations for Microsoft 365 apps for enterprise, and support for Remote Desktop Services (RDS) environments. You can deploy and scale your Windows desktops and apps on Azure in minutes, and get built-in security and compliance features. Windows Virtual Desktop doesn't require you to open any inbound access to your virtual network. However, you must allow a set of outbound network connections for the Windows Virtual Desktop virtual machines that run in your virtual network. For more information, see [Use Azure Firewall to protect Window Virtual Desktop deployments](protect-azure-virtual-desktop.md).
22+
Azure Virtual Desktop is a comprehensive desktop and app virtualization service running in Azure. It’s the only virtual desktop infrastructure (VDI) that delivers simplified management, multi-session Windows 10/11, optimizations for Microsoft 365 apps for enterprise, and support for Remote Desktop Services (RDS) environments. You can deploy and scale your Windows desktops and apps on Azure in minutes, and get built-in security and compliance features. Azure Virtual Desktop doesn't require you to open any inbound access to your virtual network. However, you must allow a set of outbound network connections for the Windows Virtual Desktop virtual machines that run in your virtual network. For more information, see [Use Azure Firewall to protect Window Virtual Desktop deployments](protect-azure-virtual-desktop.md).
2323

2424
## Next steps
2525

26-
Learn more about [Windows Virtual Desktop](../virtual-desktop/index.yml).
26+
Learn more about [Azure Virtual Desktop](../virtual-desktop/index.yml).

articles/sentinel/troubleshooting-cef-syslog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ Use the following sections to check your CEF or Syslog data connector prerequisi
273273
274274
If you're using an Azure Virtual Machine as a CEF collector, verify the following:
275275
276-
- Before you deploy the [Common Event Format Data connector python script](./connect-log-forwarder.md), make sure that your Virtual Machine isn't already connected to an existing Log Analytics workspace. You can find this information on the Log Analytics Workspace Virtual Machine list, where a VM that's connected to a Syslog workspace is listed as **Connected**.
276+
- Before you deploy the [Common Event Format Data connector Python script](./connect-log-forwarder.md), make sure that your Virtual Machine isn't already connected to an existing Log Analytics workspace. You can find this information on the Log Analytics Workspace Virtual Machine list, where a VM that's connected to a Syslog workspace is listed as **Connected**.
277277
278278
- Make sure that Microsoft Sentinel is connected to the correct Log Analytics workspace, with the **SecurityInsights** solution installed.
279279

articles/storage/blobs/lifecycle-management-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Filters include:
134134
| Filter name | Filter type | Notes | Is Required |
135135
|-------------|-------------|-------|-------------|
136136
| blobTypes | An array of predefined enum values. | The current release supports `blockBlob` and `appendBlob`. Only delete is supported for `appendBlob`, set tier is not supported. | Yes |
137-
| prefixMatch | An array of strings for prefixes to be matched. Each rule can define up to 10 case-senstive prefixes. A prefix string must start with a container name. For example, if you want to match all blobs under `https://myaccount.blob.core.windows.net/sample-container/blob1/...` for a rule, the prefixMatch is `sample-container/blob1`. | If you don't define prefixMatch, the rule applies to all blobs within the storage account. | No |
137+
| prefixMatch | An array of strings for prefixes to be matched. Each rule can define up to 10 case-sensitive prefixes. A prefix string must start with a container name. For example, if you want to match all blobs under `https://myaccount.blob.core.windows.net/sample-container/blob1/...` for a rule, the prefixMatch is `sample-container/blob1`. | If you don't define prefixMatch, the rule applies to all blobs within the storage account. | No |
138138
| blobIndexMatch | An array of dictionary values consisting of blob index tag key and value conditions to be matched. Each rule can define up to 10 blob index tag condition. For example, if you want to match all blobs with `Project = Contoso` under `https://myaccount.blob.core.windows.net/` for a rule, the blobIndexMatch is `{"name": "Project","op": "==","value": "Contoso"}`. | If you don't define blobIndexMatch, the rule applies to all blobs within the storage account. | No |
139139

140140
To learn more about the blob index feature together with known issues and limitations, see [Manage and find data on Azure Blob Storage with blob index](storage-manage-find-blobs.md).

articles/storage/common/storage-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ You can access resources in a storage account by any language that can make HTTP
154154
- [Azure Storage REST API](/rest/api/storageservices/)
155155
- [Azure Storage client library for .NET](/dotnet/api/overview/azure/storage)
156156
- [Azure Storage client library for Java/Android](/java/api/overview/azure/storage)
157-
- [Azure Storage client library for Node.js]((/azure/storage/blobs/reference#javascript-client-libraries)
157+
- [Azure Storage client library for Node.js](/azure/storage/blobs/reference#javascript-client-libraries)
158158
- [Azure Storage client library for Python](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-blob)
159159
- [Azure Storage client library for PHP](https://github.com/Azure/azure-storage-php)
160160
- [Azure Storage client library for Ruby](https://github.com/Azure/azure-storage-ruby)

includes/iot-pnp-service-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ python --version
2020

2121
The **azure-iot-device** package is published as a PIP.
2222

23-
In your local python environment install the package as follows:
23+
In your local Python environment install the package as follows:
2424

2525
```cmd/sh
2626
pip install azure-iot-device

0 commit comments

Comments
 (0)