Skip to content

Commit ebc9c62

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ez-er
2 parents 04fda53 + 984aa74 commit ebc9c62

File tree

7 files changed

+43
-46
lines changed

7 files changed

+43
-46
lines changed

articles/azure-netapp-files/azure-netapp-files-delegate-subnet.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 10/09/2024
8+
ms.date: 11/27/2024
99
ms.author: anfdocs
1010
---
1111
# Delegate a subnet to Azure NetApp Files
@@ -14,7 +14,15 @@ You must delegate a subnet to Azure NetApp Files. When you create a volume, you
1414

1515
## Considerations
1616

17-
* When creating the delegated subnet for Azure NetApp Files, the size of the subnet matters. A subnet with a /28 network mask provides (only) 11 usable IP addresses, which might be insufficient for certain use cases. In that case, you should plan for a larger delegated subnet. For instance, a subnet with a /26 network mask provides 59 and a /24 network mask provides 251 available IP addresses respectively. You should consider even larger subnets (for example, /23 network mask) in scenarios where application volume group for SAP HANA is used and where many volumes and storage endpoints are anticipated. The network mask of the delegated network can't be changed after the initial creation. Make sure to plan your virtual network (VNet) and delegated subnet sizes consciously.
17+
* When creating the delegated subnet for _Azure NetApp Files_, consider the size of the subnet. A subnet with a **/28 network mask** provides only **11 usable IP addresses**, which might be insufficient for certain use cases. Consider creating a larger subnet mask. For example:
18+
19+
- A **/26 network mask** provides **59 usable IP addresses**
20+
- A **/24 network mask** provides **251 usable IP addresses**
21+
22+
In scenarios involving high application volume counts such as _SAP HANA_, consider larger subnets, like a **/23 network mask.** Larger subnets are especially beneficial if you expect many volumes and storage endpoints.
23+
24+
Once the delegated network is created, its network mask cannot be altered. Thus it's essential to thoughtfully plan your virtual network (VNet) and delegated subnet sizes with an eye toward the future.
25+
1826
* In each VNet, only one subnet can be delegated to Azure NetApp Files.
1927
Azure enables you to create multiple delegated subnets in a VNet. However, any attempts to create a new volume would fail if you use more than one delegated subnet.
2028
You can have only a single delegated subnet in a VNet. A NetApp account can deploy volumes into multiple VNets, each having its own delegated subnet.

articles/data-factory/connector-rest.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ The backend will automatically get the next URL based on the RFC 5988 style link
928928
>
929929
> :::image type="content" source="media/connector-rest/pagination-rule-example-7-disable-rfc5988.png" alt-text="Screenshot showing how to disable R F C 5988 setting for Example 7.":::
930930
931-
#### Example 8: The next request URL is from the response body when use pagination in mapping data flows
931+
#### Example 8a: The next request URL is in the response body when using pagination in mapping data flows
932932

933933
This example states how to set the pagination rule and the end condition rule in mapping data flows when the next request URL is from the response body.
934934

@@ -952,6 +952,18 @@ But if the value of **@odata.nextLink** in the last response body is equal to th
952952

953953
:::image type="content" source="media/connector-rest/pagination-rule-example-8-end-condition-2.png" alt-text="Screenshot showing setting the end condition rule when the complete key in the response header equals to true indicates the end of pagination.":::
954954

955+
#### Example 8b: The next request URL is in the response body when using pagination in copy activity
956+
957+
This example demonstrates how to set the pagination rule in a copy activity when the next request URL is contained within the response body.
958+
959+
The response schema is shown below:
960+
961+
:::image type="content" source="media/connector-rest/pagination-rule-example-8-response-schema.png" alt-text="Screenshot showing the response schema of Example 8b.":::
962+
963+
The pagination rules should be set as shown in the following screenshot:
964+
965+
:::image type="content" source="media/connector-rest/pagination-rule-example-8b.png" alt-text="Screenshot showing how to set the pagination rule for Example 8b.":::
966+
955967
#### Example 9: The response format is XML and the next request URL is from the response body when use pagination in mapping data flows
956968

957969
This example states how to set the pagination rule in mapping data flows when the response format is XML and the next request URL is from the response body. As shown in the following screenshot, the first URL is *https://\<user\>.dfs.core.windows.NET/bugfix/test/movie_1.xml*
13.9 KB
Loading

articles/event-grid/handler-service-bus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In the Azure portal, while creating an event subscription, select **Service Bus
1818
:::image type="content" source="./media/handler-service-bus/queue.png" lightbox="./media/handler-service-bus/queue.png" alt-text="Screenshot showing the configuration of a Service Bus queue handler.":::
1919

2020
> [!NOTE]
21-
> Session enabled queues are not supported as event handlers for Azure Event Grid events
21+
> If you are using session enabled queue/topic subscription as the destination, you need to set the session property on the event using Delivery Property with the header name 'SessionId'.
2222
2323
### Use Azure CLI
2424
Use the [`az eventgrid event-subscription create`](/cli/azure/eventgrid/event-subscription) command with `--endpoint-type` set to `servicebusqueue` and `--endpoint` set to `/subscriptions/{AZURE SUBSCRIPTION}/resourceGroups/<RESOURCE GROUP NAME>/providers/Microsoft.ServiceBus/namespaces/<NAMESPACE NAME>/queues/<QUEUE NAME>`. Here's an example:

articles/index.yml

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.topic: hub-page
1414
author: JnHs
1515
ms.author: jenhayes
16-
ms.date: 04/17/2024
16+
ms.date: 12/04/2024
1717
featureFlags:
1818
- clicktale
1919
highlightedContent:
@@ -24,17 +24,17 @@ highlightedContent:
2424
itemType: get-started
2525
url: /azure/developer/
2626
# Card
27+
- title: Build skills with Microsoft Learn for Azure
28+
itemType: learn
29+
url: /training/azure
30+
# Card
2731
- title: Design your app using the Azure Architecture Center
2832
itemType: architecture
2933
url: /azure/architecture/
3034
# Card
31-
- title: Prepare your org with the Cloud Adoption Framework
35+
- title: Achieve organizational goals with the Cloud Adoption Framework
3236
itemType: overview
3337
url: /azure/cloud-adoption-framework/
34-
# Card
35-
- title: Build your skills with Microsoft Learn training
36-
itemType: learn
37-
url: /training/browse/?products=azure&resource_type=learning%20path
3838

3939
productDirectory:
4040
title: Browse Azure products
@@ -64,7 +64,7 @@ productDirectory:
6464
url: /azure/ai-studio/
6565
# Card
6666
- title: Speech
67-
summary: Speech to text, text to speech, translation and speaker recognition
67+
summary: Speech to text, text to speech, translation, and speaker recognition
6868
imageSrc: ./media/index/speech.svg
6969
azureCategories:
7070
- ai-machine-learning
@@ -196,7 +196,7 @@ productDirectory:
196196
url: communications-gateway/index.yml
197197
# Card
198198
- title: Data Science Virtual Machines
199-
summary: Rich pre-configured environment for AI development
199+
summary: Rich preconfigured environment for AI development
200200
imageSrc: ./media/index/virtual-machine.svg
201201
azureCategories:
202202
- ai-machine-learning
@@ -351,14 +351,6 @@ productDirectory:
351351
- iot
352352
url: logic-apps/index.yml
353353
# Card
354-
- title: API Apps
355-
summary: Easily build and consume Cloud APIs
356-
imageSrc: ./media/index/api-apps.svg
357-
azureCategories:
358-
- compute
359-
- containers
360-
- web
361-
url: app-service/index.yml
362354
# Card
363355
- title: App Service
364356
summary: Quickly create powerful cloud apps for web and mobile
@@ -463,7 +455,7 @@ productDirectory:
463455
- compute
464456
url: cloud-services-extended-support/index.yml
465457
# Card
466-
- title: Container Instances
458+
- title: Azure Container Instances
467459
summary: Easily run containers on Azure without managing servers
468460
imageSrc: ./media/index/container-instances.svg
469461
azureCategories:
@@ -509,15 +501,6 @@ productDirectory:
509501
- containers
510502
url: /azure/service-fabric/
511503
# Card
512-
- title: Web Apps
513-
summary: Quickly create and deploy mission critical web apps at scale
514-
imageSrc: ./media/index/app-service.svg
515-
azureCategories:
516-
- compute
517-
- containers
518-
- web
519-
url: app-service/index.yml
520-
# Card
521504
- title: Azure Virtual Desktop
522505
summary: The best virtual desktop experience, delivered on Azure
523506
imageSrc: ./media/index/virtual-desktop.svg
@@ -541,7 +524,7 @@ productDirectory:
541524
- containers
542525
url: /azure/virtual-machines/linux/openshift-get-started
543526
# Card
544-
- title: Container Registry
527+
- title: Azure Container Registry
545528
summary: Store and manage container images across all types of Azure deployments
546529
imageSrc: ./media/index/container-registry.svg
547530
azureCategories:
@@ -785,7 +768,7 @@ productDirectory:
785768
url: managed-grafana/index.yml
786769
# Card
787770
- title: GitHub Actions for Azure
788-
summary: Build, test and deploy any app from GitHub to Azure
771+
summary: Build, test, and deploy any app from GitHub to Azure
789772
imageSrc: ./media/index/github-actions-icon.svg
790773
azureCategories:
791774
- devops
@@ -805,6 +788,7 @@ productDirectory:
805788
summary: Synchronize on-premises directories and enable single sign-on
806789
imageSrc: ./media/index/active-directory.svg
807790
azureCategories:
791+
- featured
808792
- hybrid
809793
- identity
810794
- security
@@ -849,7 +833,7 @@ productDirectory:
849833
url: /azure/azure-local/
850834
# Card
851835
- title: Azure Stack Hub
852-
summary: Azure Stack Hub is sold as an integrated hardware system, with software pre-installed on validated hardware
836+
summary: Azure Stack Hub is sold as an integrated hardware system, with software preinstalled on validated hardware
853837
imageSrc: ./media/index/stack-hub.svg
854838
azureCategories:
855839
- hybrid
@@ -934,7 +918,7 @@ productDirectory:
934918
url: iot-central/index.yml
935919
# Card
936920
- title: Azure IoT Hub
937-
summary: Connect, monitor and manage billions of IoT assets
921+
summary: Connect, monitor, and manage billions of IoT assets
938922
imageSrc: ./media/index/iot-hub.svg
939923
azureCategories:
940924
- iot
@@ -1614,10 +1598,10 @@ additionalContent:
16141598
- title: Partner solutions
16151599
items:
16161600
# Card
1617-
- title: Azure Native ISV Services
1618-
summary: Integrated partner solutions that you can use in Azure to enhance your cloud infrastructure.
1619-
url: ./partner-solutions/index.yml
1620-
# Card
16211601
- title: Commercial marketplace
16221602
summary: An online marketplace of applications and services from independent software vendor (ISV) partners.
16231603
url: ./marketplace/index.yml
1604+
# Card
1605+
- title: Azure Native ISV Services
1606+
summary: Integrated partner solutions that you can use in Azure to enhance your cloud infrastructure.
1607+
url: ./partner-solutions/index.yml

articles/media/index/api-apps.svg

Lines changed: 0 additions & 7 deletions
This file was deleted.

articles/security/fundamentals/azure-CA-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ To determine if the **Microsoft ECC Root Certificate Authority 2017** and **Micr
238238
1. To add a root certificate to the trusted root certificate store in Java, you can use the `keytool` utility. The following example adds the **Microsoft RSA Root Certificate Authority 2017** root certificate:
239239
240240
```bash
241-
keytool -import -file microsoft-ecc-root-ca.crt -alias microsoft-rsa-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
241+
keytool -import -file microsoft-ecc-root-ca.crt -alias microsoft-ecc-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
242242
keytool -import -file microsoft-rsa-root-ca.crt -alias microsoft-rsa-root-ca -keystore $JAVA_HOME/jre/lib/security/cacerts
243243
```
244244

0 commit comments

Comments
 (0)