Skip to content

Commit e7a9ee5

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into redirect
2 parents 0a87e0f + 9df4017 commit e7a9ee5

31 files changed

+154
-29
lines changed

articles/active-directory-b2c/deploy-custom-policies-github-action.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ For the GitHub Action to access data in Microsoft Graph, grant the registered ap
4848

4949
GitHub secrets are encrypted environment variables that you create in an organization, repository, or repository environment. In this step, you store the application secret for the application you registered earlier in the [Register an MS Graph application](#register-a-microsoft-graph-application) step.
5050

51-
The GitHub Action for deploying Azure AD B2C custom policies uses the secret to acquire an access token that is used to interact with the Microsoft Graph API. For more information, see [Creating encrypted secrets for a repository](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#creating-encrypted-secrets-for-a-repository).
51+
The GitHub Action for deploying Azure AD B2C custom policies uses the secret to acquire an access token that is used to interact with the Microsoft Graph API. For more information, see [Creating encrypted secrets for a repository](https://docs.github.com/actions/security-guides/using-secrets-in-github-actions#creating-encrypted-secrets-for-a-repository).
5252

5353
To create a GitHub secret, follow these steps:
5454

@@ -141,9 +141,9 @@ To test the workflow you created, **Push** the changes of your custom policy. On
141141

142142
## Optional: Schedule your workflow
143143

144-
The workflow you created is triggered by the [push](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push) event. If you prefer, you can choose another event to trigger the workflow, for example a [pull request](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request).
144+
The workflow you created is triggered by the [push](https://docs.github.com/actions/using-workflows/events-that-trigger-workflows#push) event. If you prefer, you can choose another event to trigger the workflow, for example a [pull request](https://docs.github.com/actions/using-workflows/events-that-trigger-workflows#pull_request).
145145

146-
You can also schedule a workflow to run at specific UTC times using [POSIX cron syntax](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07). The schedule event allows you to trigger a workflow at a scheduled time. For more information, see [Scheduled events](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#scheduled-events).
146+
You can also schedule a workflow to run at specific UTC times using [POSIX cron syntax](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07). The schedule event allows you to trigger a workflow at a scheduled time. For more information, see [Scheduled events](https://docs.github.com/actions/using-workflows/events-that-trigger-workflows#scheduled-events).
147147

148148
The following example triggers the workflow every day at 5:30 and 17:30 UTC:
149149

@@ -170,4 +170,4 @@ To edit your workflow:
170170

171171
## Next steps
172172

173-
- Learn how to configure [Events that trigger workflows](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows)
173+
- Learn how to configure [Events that trigger workflows](https://docs.github.com/actions/using-workflows/events-that-trigger-workflows)

articles/active-directory-b2c/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ conceptualContent:
217217
url: custom-domain.md
218218
itemType: how-to-guide
219219
- text: Customize user experiences using custom policies
220-
url: add-sign-up-and-sign-in-policy.md?pivots=b2c-custom-policy
220+
url: add-sign-up-and-sign-in-policy.md?pivots=b2c-custom-policy
221221
itemType: how-to-guide
222222
- text: Custom policy how-to guide series
223-
url: custom-policies-series-overview.md
223+
url: custom-policies-series-overview.md
224224
itemType: how-to-guide
225225
# - text: Use API connectors
226226
# url: add-api-connector.md?pivots=b2c-user-flow

articles/active-directory/hybrid/connect/how-to-connect-pta-user-privacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,5 @@ To schedule this script to run every 48 hours follow these steps:
100100
If audit logging is enabled, this product may generate security logs for your Domain Controllers. To learn more about configuring audit policies, read this [article](/previous-versions/tn-archive/dd277403(v=technet.10)).
101101

102102
## Next steps
103-
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trustcenter)
103+
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trust-center)
104104
* [**Troubleshoot**](tshoot-connect-pass-through-authentication.md) - Learn how to resolve common issues with the feature.

articles/active-directory/hybrid/connect/how-to-connect-sso-user-privacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ If audit logging is enabled, this product may generate security logs for your Do
6161

6262
## Next steps
6363

64-
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trustcenter)
64+
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trust-center)
6565
- [**Troubleshoot**](tshoot-connect-sso.md) - Learn how to resolve common issues with the feature.
6666
- [**UserVoice**](https://feedback.azure.com/d365community/forum/22920db1-ad25-ec11-b6e6-000d3a4f0789) - For filing new feature requests.

articles/active-directory/hybrid/connect/reference-connect-health-user-privacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ For tenants, data collection can be resumed in Azure AD Connect Health. We recom
9797

9898
## Next steps
9999

100-
- Review the [Microsoft privacy policy in the Trust Center](https://www.microsoft.com/trustcenter).
100+
- Review the [Microsoft privacy policy in the Trust Center](https://www.microsoft.com/trust-center).
101101
- Learn about [Azure AD Connect and user privacy](reference-connect-user-privacy.md).

articles/active-directory/hybrid/connect/reference-connect-user-privacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ Use the following steps to schedule the script to run every 48 hours.
7777

7878

7979
## Next steps
80-
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trustcenter)
80+
* [Review the Microsoft Privacy policy on Trust Center](https://www.microsoft.com/trust-center)
8181
* [Azure AD Connect Health and User Privacy](reference-connect-health-user-privacy.md)

articles/active-directory/roles/security-planning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The security of business assets depends on the integrity of the privileged accou
2424
For cloud services, prevention and response are the joint responsibilities of the cloud service provider and the customer. For more information about the latest threats to endpoints and the cloud, see the [Microsoft Security Intelligence Report](https://www.microsoft.com/security/operations/security-intelligence-report). This article can help you develop a roadmap toward closing the gaps between your current plans and the guidance described here.
2525

2626
> [!NOTE]
27-
> Microsoft is committed to the highest levels of trust, transparency, standards conformance, and regulatory compliance. Learn more about how the Microsoft global incident response team mitigates the effects of attacks against cloud services, and how security is built into Microsoft business products and cloud services at [Microsoft Trust Center - Security](https://www.microsoft.com/trustcenter/security) and Microsoft compliance targets at [Microsoft Trust Center - Compliance](https://www.microsoft.com/trustcenter/compliance).
27+
> Microsoft is committed to the highest levels of trust, transparency, standards conformance, and regulatory compliance. Learn more about how the Microsoft global incident response team mitigates the effects of attacks against cloud services, and how security is built into Microsoft business products and cloud services at [Microsoft Trust Center - Security](https://www.microsoft.com/trustcenter/security) and Microsoft compliance targets at [Microsoft Trust Center - Compliance](https://www.microsoft.com/trust-center/compliance/compliance-overview).
2828
2929
Traditionally, organizational security was focused on the entry and exit points of a network as the security perimeter. However, SaaS apps and personal devices on the Internet have made this approach less effective. In Azure AD, we replace the network security perimeter with authentication in your organization's identity layer, with users assigned to privileged administrative roles in control. Their access must be protected, whether the environment is on-premises, cloud, or a hybrid.
3030

@@ -462,7 +462,7 @@ For more information about how Microsoft Office 365 handles security incidents,
462462

463463
* [Microsoft Trust Center for Product Security](https://www.microsoft.com/trustcenter/security) – Security features of Microsoft cloud products and services
464464

465-
* [Microsoft Trust Center - Compliance](https://www.microsoft.com/trustcenter/compliance/complianceofferings) – Microsoft's comprehensive set of compliance offerings for cloud services
465+
* [Microsoft compliance offerings](/compliance/regulatory/offering-home) – Microsoft's comprehensive set of compliance offerings for cloud services
466466

467467
* [Guidance on how to do a risk assessment](https://www.microsoft.com/trustcenter/guidance/risk-assessment) - Manage security and compliance requirements for Microsoft cloud services
468468

articles/ai-services/speech-service/includes/common/azure-prerequisites-openai.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: eur
1010
> [!div class="checklist"]
1111
> * Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services)
1212
> * [Create a Microsoft Azure OpenAI Service resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesOpenAI) in the Azure portal.
13-
> * Deploy a [model](/azure/ai-services/openai/concepts/models.md) in your Azure OpenAI resource. For more information about model deployment, see the Azure OpenAI [resource deployment guide](/azure/ai-services/openai/how-to/create-resource.md).
13+
> * Deploy a [model](/azure/ai-services/openai/concepts/models) in your Azure OpenAI resource. For more information about model deployment, see the Azure OpenAI [resource deployment guide](/azure/ai-services/openai/how-to/create-resource).
1414
> * Get the Azure OpenAI resource key and endpoint. After your Azure OpenAI resource is deployed, select **Go to resource** to view and manage keys. For more information about Azure AI services resources, see [Get the keys for your resource](~/articles/ai-services/multi-service-resource.md?pivots=azportal#get-the-keys-for-your-resource).
1515
> * [Create a Speech resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesSpeechServices) in the Azure portal.
1616
> * Get the Speech resource key and region. After your Speech resource is deployed, select **Go to resource** to view and manage keys. For more information about Azure AI services resources, see [Get the keys for your resource](~/articles/ai-services/multi-service-resource.md?pivots=azportal#get-the-keys-for-your-resource).

articles/analysis-services/analysis-services-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Service principals are an Azure Active Directory application resource you create
197197
### Azure governance
198198

199199
Azure Analysis Services is governed by the [Microsoft Online Services Terms](https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=31) and the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement).
200-
To learn more about Azure Security, see the [Microsoft Trust Center](https://www.microsoft.com/trustcenter).
200+
To learn more about Azure Security, see the [Microsoft Trust Center](https://www.microsoft.com/trust-center).
201201

202202
## Use the tools you already know
203203

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Azure App Service is a fully managed platform as a service (PaaS) offering for d
2828
* **DevOps optimization** - Set up [continuous integration and deployment](deploy-continuous-deployment.md) with Azure DevOps, GitHub, BitBucket, Docker Hub, or Azure Container Registry. Promote updates through [test and staging environments](deploy-staging-slots.md). Manage your apps in App Service by using [Azure PowerShell](/powershell/azure/) or the [cross-platform command-line interface (CLI)](/cli/azure/install-azure-cli).
2929
* **Global scale with high availability** - Scale [up](manage-scale-up.md) or [out](../azure-monitor/autoscale/autoscale-get-started.md) manually or automatically. Host your apps anywhere in Microsoft's global datacenter infrastructure, and the App Service [SLA](https://azure.microsoft.com/support/legal/sla/app-service/) promises high availability.
3030
* **Connections to SaaS platforms and on-premises data** - Choose from [many hundreds of connectors](/connectors/connector-reference/connector-reference-logicapps-connectors) for enterprise systems (such as SAP), SaaS services (such as Salesforce), and internet services (such as Facebook). Access on-premises data using [Hybrid Connections](app-service-hybrid-connections.md) and [Azure Virtual Networks](./overview-vnet-integration.md).
31-
* **Security and compliance** - App Service is [ISO, SOC, and PCI compliant](https://www.microsoft.com/trustcenter). Create [IP address restrictions](app-service-ip-restrictions.md) and [managed service identities](overview-managed-identity.md). [Prevent subdomain takeovers](reference-dangling-subdomain-prevention.md).
31+
* **Security and compliance** - App Service is [ISO, SOC, and PCI compliant](https://www.microsoft.com/trust-center). Create [IP address restrictions](app-service-ip-restrictions.md) and [managed service identities](overview-managed-identity.md). [Prevent subdomain takeovers](reference-dangling-subdomain-prevention.md).
3232
* **Authentication** - [Authenticate users](overview-authentication-authorization.md) using the built-in authentication component. Authenticate users with [Azure Active Directory](configure-authentication-provider-aad.md), [Google](configure-authentication-provider-google.md), [Facebook](configure-authentication-provider-facebook.md), [Twitter](configure-authentication-provider-twitter.md), or [Microsoft account](configure-authentication-provider-microsoft.md).
3333
* **Application templates** - Choose from an extensive list of application templates in the [Azure Marketplace](https://azure.microsoft.com/marketplace/), such as WordPress, Joomla, and Drupal.
3434
* **Visual Studio and Visual Studio Code integration** - Dedicated tools in Visual Studio and Visual Studio Code streamline the work of creating, deploying, and debugging.

0 commit comments

Comments
 (0)