Skip to content

Commit a51b3fc

Browse files
authored
Merge pull request #192315 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 ca56a72 + 9b1ce13 commit a51b3fc

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

articles/active-directory/hybrid/index.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ landingContent:
2828
- text: What is hybrid identity?
2929
url: whatis-hybrid-identity.md
3030
- text: What is inter-directory provisioning?
31-
url: whatis-hybrid-identity.md
31+
url: what-is-inter-directory-provisioning.md
3232

3333
# Card
3434
- title: Determine the best solution to manage the lifecycle of your users and groups
@@ -45,6 +45,8 @@ landingContent:
4545
url: tutorial-passthrough-authentication.md
4646
- text: Integrate a single AD forest using federation
4747
url: tutorial-federation.md
48+
- text: Set up PHS as backup for AD FS in Azure AD Connect
49+
url: tutorial-phs-backup.md
4850

4951

5052
# Card

articles/azure-arc/servers/manage-agent.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ The azcmagent tool is used to configure the Azure Connected Machine agent during
2121

2222
* **show** - View agent status and its configuration properties (Resource Group name, Subscription ID, version, etc.), which can help when troubleshooting an issue with the agent. Include the `-j` parameter to output the results in JSON format.
2323

24-
* **config** - View and change settings to enable features and control agent behavior
24+
* **config** - View and change settings to enable features and control agent behavior.
25+
26+
* **check** - Validate network connectivity.
2527

2628
* **logs** - Creates a .zip file in the current directory containing logs to assist you while troubleshooting.
2729

articles/cognitive-services/Bing-Web-Search/includes/quickstarts/web-search-client-library-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Create a new Java project using Maven or your favorite build automation tool. As
3838
<version>1.4.0</version>
3939
<configuration>
4040
<!--Your comment
41-
Replace the mainClass with the path to your java application.
41+
Replace the mainClass with the path to your Java application.
4242
It should begin with com and doesn't require the .java extension.
4343
For example: com.bingwebsearch.app.BingWebSearchSample. This maps to
4444
The following directory structure:
@@ -70,7 +70,7 @@ Create a new Java project using Maven or your favorite build automation tool. As
7070
<archive>
7171
<manifest>
7272
<!--Your comment
73-
Replace the mainClass with the path to your java application.
73+
Replace the mainClass with the path to your Java application.
7474
For example: com.bingwebsearch.app.BingWebSearchSample.java.
7575
This maps to the following directory structure:
7676
src/main/java/com/bingwebsearch/app/BingWebSearchSample.java.

articles/cognitive-services/LUIS/includes/get-started-get-model-rest-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.custom: devx-track-java
2727

2828
1. Create a new folder to hold your Java project, such as `java-model-with-rest`.
2929

30-
1. Make a subdirectory named `lib` and copy in the following java libs into the `lib` subdirectory:
30+
1. Make a subdirectory named `lib` and copy in the following Java libs into the `lib` subdirectory:
3131

3232
* [commons-logging-1.2.jar](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-language-understanding/master/documentation-samples/quickstarts/analyze-text/java/lib/commons-logging-1.2.jar)
3333
* [httpclient-4.5.3.jar](https://raw.githubusercontent.com/Azure-Samples/cognitive-services-language-understanding/master/documentation-samples/quickstarts/analyze-text/java/lib/httpclient-4.5.3.jar)

articles/service-fabric/concepts-managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The following scenarios are not supported or not recommended; note these actions
5151

5252
- Remove or change the identities assigned to an application; if you must make changes, submit separate deployments to first add a new identity assignment, and then to remove a previously assigned one. Removal of an identity from an existing application can have undesirable effects, including leaving your application in a state that is not upgradeable. It is safe to delete the application altogether if the removal of an identity is necessary; note this will delete the system-assigned identity (if so defined) associated with the application, and will remove any associations with the user-assigned identities assigned to the application.
5353

54-
- Service Fabric support for managed identities is not integrated at this time into the [AzureServiceTokenProvider](/dotnet/api/overview/azure/service-to-service-authentication).
54+
- Service Fabric support for managed identities is not integrated at this time into the deprecated [AzureServiceTokenProvider](/dotnet/api/overview/azure/service-to-service-authentication). However, Service Fabric does support leveraging managed identities instead through the [Azure Identity SDK](./how-to-managed-identity-service-fabric-app-code.md)
5555

5656
## Next steps
5757

@@ -61,4 +61,4 @@ The following scenarios are not supported or not recommended; note these actions
6161
- [Deploy an Azure Service Fabric application with a user-assigned managed identity](./how-to-deploy-service-fabric-application-user-assigned-managed-identity.md)
6262
- [Leverage the managed identity of a Service Fabric application from service code](./how-to-managed-identity-service-fabric-app-code.md)
6363
- [Grant an Azure Service Fabric application access to other Azure resources](./how-to-grant-access-other-resources.md)
64-
- [Declaring and using application secrets as KeyVaultReferences](./service-fabric-keyvault-references.md)
64+
- [Declaring and using application secrets as KeyVaultReferences](./service-fabric-keyvault-references.md)

articles/storage/blobs/archive-rehydrate-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ A rehydration operation with [Set Blob Tier](/rest/api/storageservices/set-blob-
107107

108108
Copying an archived blob to an online tier with [Copy Blob](/rest/api/storageservices/copy-blob) is billed for data read transactions and data retrieval size. Creating the destination blob in an online tier is billed for data write transactions. Early deletion fees don't apply when you copy to an online blob because the source blob remains unmodified in the Archive tier. High-priority retrieval charges do apply if selected.
109109

110-
Blobs in the Archive tier should be stored for a minimum of 180 days. Deleting or changing the tier of an archived blob before the 180-day period elapses incurs an early deletion fee. For more information, see [Archive access tier](access-tiers-overview.md#archive-access-tier).
110+
Blobs in the Archive tier should be stored for a minimum of 180 days. Deleting or changing the tier of an archived blob before the 180-day period elapses incurs an early deletion fee.For example, if a blob is moved to the Archive tier and then deleted or moved to the Hot tier after 45 days, you'll be charged an early deletion fee equivalent to 135 (180 minus 45) days of storing that blob in the Archive tier. For more information, see [Archive access tier](access-tiers-overview.md#archive-access-tier).
111111

112112
For more information about pricing for block blobs and data rehydration, see [Azure Storage Pricing](https://azure.microsoft.com/pricing/details/storage/blobs/). For more information on outbound data transfer charges, see [Data Transfers Pricing Details](https://azure.microsoft.com/pricing/details/data-transfers/).
113113

@@ -117,4 +117,4 @@ For more information about pricing for block blobs and data rehydration, see [Az
117117
- [Archive a blob](archive-blob.md)
118118
- [Rehydrate an archived blob to an online tier](archive-rehydrate-to-online-tier.md)
119119
- [Run an Azure Function in response to a blob rehydration event](archive-rehydrate-handle-event.md)
120-
- [Reacting to Blob storage events](storage-blob-event-overview.md)
120+
- [Reacting to Blob storage events](storage-blob-event-overview.md)

0 commit comments

Comments
 (0)