Skip to content

Commit 237052e

Browse files
authored
Merge pull request #299103 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 1a6f1c3 + 51bacbc commit 237052e

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

articles/backup/scripts/geo-code-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This sample XML provides you with an insight about the geo-codes mapped with the
6868
<GeoCodeRegionNameMap GeoCode="JIW" RegionName="Jio India West" />
6969
<GeoCodeRegionNameMap GeoCode="QAC" RegionName="Qatar Central" />
7070
<GeoCodeRegionNameMap GeoCode="PLC" RegionName="Poland Central" />
71-
<GeoCodeRegionNameMap GeoCode="MYS" RegionName="Malaysia South" /
71+
<GeoCodeRegionNameMap GeoCode="MYS" RegionName="Malaysia South" />
7272
<GeoCodeRegionNameMap GeoCode="TWN" RegionName="Taiwan North" />
7373
<GeoCodeRegionNameMap GeoCode="TWNR" RegionName="Taiwan Northwest" />
7474
<GeoCodeRegionNameMap GeoCode="ILC" RegionName="Israel Central" />

articles/communication-services/samples/trusted-auth-sample.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To be able to run this sample, you need:
4444
- Update the Server (Web API) application with information from the app registrations.
4545

4646
::: zone pivot="programming-language-javascript"
47-
[!INCLUDE [NodeJS Auth Hero](./includes/node-auth-hero.md)]
47+
[!INCLUDE [Node.js Auth Hero](./includes/node-auth-hero.md)]
4848
::: zone-end
4949

5050
::: zone pivot="programming-language-csharp"

articles/event-grid/subscribe-to-graph-api-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Web application samples are available for the following languages:
213213
214214
- [C# sample](https://github.com/microsoftgraph/msgraph-sample-eventgrid-notifications-dotnet). It's an up-to-date sample that includes how to create and renew Graph API subscriptions and walks you through some of the steps to enable the flow of events.
215215
- [Java sample](https://github.com/microsoftgraph/java-spring-webhooks-sample)
216-
- [NodeJS sample](https://github.com/microsoftgraph/nodejs-webhooks-sample).
216+
- [Node.js sample](https://github.com/microsoftgraph/nodejs-webhooks-sample).
217217
218218
> [!IMPORTANT]
219219
> You need to activate your partner topic that is created as part of your Graph API subscription creation. You also need to create an Event Grid event subscription to your web application to receive events. To that end, you use the URL configured in your web application to receive events as a webhook endpoint in your event subscription. [Next steps](#next-steps) for more information.

articles/event-hubs/schema-registry-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You can use one of the following libraries to include an Avro serializer. You ca
107107
| **.NET** | [Microsoft.Azure.Data.SchemaRegistry.ApacheAvro](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro) | [.NET Samples](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro/tests/Samples) |
108108
| **Java** | [azure-data-schemaregistry-avro](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/schemaregistry/azure-data-schemaregistry-apacheavro) | [Java samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/src/samples)|
109109
|**Python** | [azure-schemaregistry-avroserializer](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/schemaregistry/azure-schemaregistry-avroencoder/) | [Python samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples)|
110-
|**JavaScript** | [@azure/schema-registry-avro](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro) | [NodeJS samples](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro/samples) |
110+
|**JavaScript** | [@azure/schema-registry-avro](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro) | [Node.js samples](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro/samples) |
111111

112112
Additionally, the below libraries are also available based on your workloads.
113113
* **Apache Kafka**: Run [Kafka-integrated Avro](https://github.com/Azure/azure-schema-registry-for-kafka/) serializers and deserializers backed by Schema Registry. The Java client's Apache Kafka client serializer for Schema Registry can be used in any Apache Kafka scenario and with any Apache Kafka-based deployment or cloud service.

articles/spring-apps/basic-standard/concept-app-customer-responsibilities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ When you deploy your polyglot applications to the Enterprise plan, assign specif
5858
| .NET | [.NET and .NET core support policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) |
5959
| Python | [Status of Python versions](https://devguide.python.org/versions/) |
6060
| Go | [Go release history](https://go.dev/doc/devel/release) |
61-
| Node.js | [Nodejs releases](https://nodejs.org/en/about/previous-releases/) |
61+
| Node.js | [Node.js releases](https://nodejs.org/en/about/previous-releases/) |
6262
| PHP | [PHP supported versions](https://www.php.net/supported-versions.php) |
6363

6464
### Stack image support

articles/storage/files/storage-files-migration-overview.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ The following table lists supported metadata for Azure Files.
6666
| **Source** | **Target** |
6767
|------------|------------|
6868
| Directory structure | The original directory structure of the source can be preserved on the target share. |
69-
| Symbolic links | Symbolic links on the source can be preserved and mapped on the target share. |
7069
| Access permissions | Azure Files supports Windows ACLs, and they must be set on the target share even if no AD integration is configured at migration time. The following ACLs must be preserved: owner security identifier (SID), group SID, discretionary access lists (DACLs), system access control lists (SACLs). |
7170
| Create timestamp | The original create timestamp of the source file can be preserved on the target share. |
7271
| Change timestamp | The original change timestamp of the source file can be preserved on the target share. |
@@ -83,7 +82,7 @@ How to use the table:
8382

8483
1. Choose one of these targets:
8584

86-
- **Hybrid deployment:** Use Azure File Sync to cache the content of Azure file shares on-premises and tier less frequently used files to the cloud.
85+
- **Hybrid deployment:** Use [Azure File Sync](../file-sync/file-sync-introduction.md) to cache the content of Azure file shares on-premises and tier less frequently used files to the cloud.
8786
- **Cloud-only deployment:** Azure file shares in the cloud, with no on-premises caching.
8887

8988
Select the target column that matches your choice.
@@ -95,10 +94,10 @@ A scenario without a link doesn't yet have a published migration guide. Check th
9594
| Source | Target: </br>Hybrid deployment </br>(Azure Files + Azure File Sync) | Target: </br>Cloud-only deployment </br>(Azure Files)|
9695
|:---|:--|:--|
9796
| | Recommended tool combination:| Recommended tool combination: |
98-
| Windows Server 2012 R2 and later | <ul><li>[Azure File Sync](../file-sync/file-sync-deployment-guide.md)</li><li>[Azure File Sync and Azure DataBox](storage-files-migration-server-hybrid-databox.md)</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li><li>Via Azure File Sync: Follow same steps as [Azure File Sync hybrid deployment](../file-sync/file-sync-deployment-guide.md) and [decommission server endpoint](../file-sync/file-sync-server-endpoint-delete.md) at the end.</li></ul> |
99-
| Windows Server 2012 and earlier | <ul><li>Via DataBox and Azure File Sync to recent server OS</li><li>Via Storage Migration Service to recent server with Azure File Sync, then upload</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li><li>Via Storage Migration Service to recent server with Azure File Sync</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li></ul> |
100-
| Network-attached storage (NAS) | <ul><li>Via Storage Mover upload + Azure File Sync</li><li>[Via Azure File Sync upload](storage-files-migration-nas-hybrid.md)</li><li>[Via DataBox + Azure File Sync](storage-files-migration-nas-hybrid-databox.md)</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li><li>[Via DataBox](storage-files-migration-nas-cloud-databox.md)</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li></ul> |
101-
| Linux (SMB) | <ul><li>N/A</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li></ul> |
97+
| Windows Server 2012 R2 and later | <ul><li>[Azure File Sync](../file-sync/file-sync-deployment-guide.md)</li><li>[Azure File Sync and Azure DataBox](storage-files-migration-server-hybrid-databox.md)</li></ul> | <ul><li>Via Azure File Sync: Follow same steps as [Azure File Sync hybrid deployment](../file-sync/file-sync-deployment-guide.md) and [decommission server endpoint](../file-sync/file-sync-server-endpoint-delete.md) at the end.</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li></ul> |
98+
| Windows Server 2012 and earlier | <ul><li>Via [DataBox](../../databox/data-box-overview.md)</li><li>Via [Storage Migration Service](https://github.com/MicrosoftDocs/windowsserverdocs/blob/main/WindowsServerDocs/storage/storage-migration-service/overview.md) to recent server with [Azure File Sync](../file-sync/file-sync-deployment-guide.md), then upload</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li><li>Via [Storage Migration Service](https://github.com/MicrosoftDocs/windowsserverdocs/blob/main/WindowsServerDocs/storage/storage-migration-service/overview.md) to recent server with [Azure File Sync](../file-sync/file-sync-deployment-guide.md)</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li></ul> |
99+
| Linux (SMB) | <ul><li>NA</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li></ul> |
100+
| Network-attached storage (NAS) | <ul><li>Via [Storage Mover upload](migrate-files-storage-mover.md) + [Azure File Sync](../file-sync/file-sync-deployment-guide.md)</li><li>[Via Azure File Sync upload](storage-files-migration-nas-hybrid.md)</li><li>[Via DataBox + Azure File Sync](storage-files-migration-nas-hybrid-databox.md)</li></ul> | <ul><li>Via [Azure Storage Mover](migrate-files-storage-mover.md)</li><li>[Via DataBox](storage-files-migration-nas-cloud-databox.md)</li><li>[Via RoboCopy to a mounted Azure file share](storage-files-migration-robocopy.md)</li></ul> |
102101

103102
## Migration toolbox
104103

0 commit comments

Comments
 (0)