Skip to content

Commit ae43bc8

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-build-synapse-sqldw
2 parents dbb868d + 51efc85 commit ae43bc8

File tree

296 files changed

+5062
-2106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+5062
-2106
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,16 @@
250250
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
251251
"redirect_document_id": false
252252
},
253+
{
254+
"source_path": "articles/virtual-machines/windows/shared-images.md",
255+
"redirect_url": "/azure/virtual-machines/shared-images-powershell",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path": "articles/virtual-machines/linux/shared-images.md",
260+
"redirect_url": "/azure/virtual-machines/shared-images-cli",
261+
"redirect_document_id": false
262+
},
253263
{
254264
"source_path": "articles/virtual-machines/windows/encrypt-disks.md",
255265
"redirect_url": "/azure//virtual-machines/windows/disk-encryption-overview",

articles/active-directory/authentication/overview-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ Azure AD provides ways to natively authenticate using passwordless methods to si
8585

8686
## Next steps
8787

88-
To get started, see the [quickstart for self-service password reset][quickstart-sspr] and [Azure Multi-Factor Authentication tutorial][tutorial-mfa-applications].
88+
To get started, see the [tutorial for self-service password reset (SSPR)][tutorial-sspr] and [Azure Multi-Factor Authentication][tutorial-azure-mfa].
8989

9090
To learn more about self-service password reset concepts, see [How Azure AD self-service password reset works][concept-sspr].
9191

9292
To learn more about multi-factor authentication concepts, see [How Azure Multi-Factor Authentication works][concept-mfa].
9393

9494
<!-- INTERNAL LINKS -->
95-
[quickstart-sspr]: quickstart-sspr.md
96-
[tutorial-mfa-applications]: tutorial-mfa-applications.md
95+
[tutorial-sspr]: tutorial-enable-sspr.md
96+
[tutorial-azure-mfa]: tutorial-enable-azure-mfa.md
9797
[concept-sspr]: concept-sspr-howitworks.md
9898
[concept-mfa]: concept-mfa-howitworks.md

articles/active-directory/develop/sample-v2-code.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ These samples show how to write a single-page application secured with Microsoft
3838
| Platform | Description | Link |
3939
| -------- | --------------------- | -------- |
4040
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
41+
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph using Auth Code Flow w/ PKCE |[javascript-v2](https://github.com/Azure-Samples/ms-identity-javascript-v2) |
4142
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
42-
| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
43+
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls own Web API | [ms-identity-javascript-angular-spa-aspnetcore-webapi](https://github.com/Azure-Samples/ms-identity-javascript-angular-spa-aspnetcore-webapi) |
4344
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph | [active-directory-javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
45+
| ![This image shows the React logo](media/sample-v2-code/logo_react.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core)| Calls own Web API which in turn calls Microsoft Graph | [ms-identity-javascript-react-spa-dotnetcore-webapi-obo](https://github.com/Azure-Samples/ms-identity-javascript-react-spa-dotnetcore-webapi-obo) |
4446
| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
4547

4648
## Web applications

articles/active-directory/devices/manage-stale-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ To learn more about the different types, see the [device management overview](ov
175175

176176
Any authentication where a device is being used to authenticate to Azure AD are denied. Common examples are:
177177

178-
- **Hybrid Azure AD joined device** - Users might be to use the device to sign-in to their on-premises domain. However, they can't access Azure AD resources such as Office 365.
178+
- **Hybrid Azure AD joined device** - Users might be able to use the device to sign-in to their on-premises domain. However, they can't access Azure AD resources such as Office 365.
179179
- **Azure AD joined device** - Users can't use the device to sign in.
180180
- **Mobile devices** - User can't access Azure AD resources such as Office 365.
181181

articles/active-directory/fundamentals/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
- name: Deployment guide
5151
items:
5252
- name: Deployment 30, 90, and beyond
53-
href: active-directory-deployment-checklist-p2.md
53+
href: active-directory-deployment-checklist-p2.md
5454
- name: Data storage
5555
items:
5656
- name: Identity data storage for Europe

articles/aks/internal-lb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Learn more about Kubernetes services at the [Kubernetes services documentation][
145145
[advanced-networking]: configure-azure-cni.md
146146
[az-aks-show]: /cli/azure/aks#az-aks-show
147147
[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create
148-
[azure-lb-comparison]: ../load-balancer/types.md#skus
148+
[azure-lb-comparison]: ../load-balancer/skus.md
149149
[use-kubenet]: configure-kubenet.md
150150
[aks-quickstart-cli]: kubernetes-walkthrough.md
151151
[aks-quickstart-portal]: kubernetes-walkthrough-portal.md

articles/aks/load-balancer-standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Learn more about Kubernetes services at the [Kubernetes services documentation][
280280
[az-network-public-ip-prefix-show]: /cli/azure/network/public-ip/prefix?view=azure-cli-latest#az-network-public-ip-prefix-show
281281
[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create
282282
[azure-lb]: ../load-balancer/load-balancer-overview.md
283-
[azure-lb-comparison]: ../load-balancer/types.md#skus
283+
[azure-lb-comparison]: ../load-balancer/skus.md
284284
[azure-lb-outbound-rules]: ../load-balancer/load-balancer-outbound-rules-overview.md#snatports
285285
[azure-lb-outbound-connections]: ../load-balancer/load-balancer-outbound-connections.md#snat
286286
[azure-lb-outbound-preallocatedports]: ../load-balancer/load-balancer-outbound-connections.md#preallocatedports

articles/analysis-services/analysis-services-refresh-azure-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ An Azure Virtual Machine with a static public IP address can be used as an Azure
168168
> [!IMPORTANT]
169169
> Ensure the Virtual Machine public IP address is configured as static.
170170
>
171-
>To learn more about configuring Azure Automation Hybrid Workers, see [Automate resources in your datacenter or cloud by using Hybrid Runbook Worker](../automation/automation-hybrid-runbook-worker.md#install-a-hybrid-runbook-worker).
171+
>To learn more about configuring Azure Automation Hybrid Workers, see [Installation of a Hybrid Runbook Worker](../automation/automation-hybrid-runbook-worker.md#installation-of-a-hybrid-runbook-worker).
172172
173173
Once a Hybrid Worker is configured, create a Webhook as described in the section [Consume with Data Factory](#consume-with-data-factory). The only difference here is to select the **Run on** > **Hybrid Worker** option when configuring the Webhook.
174174

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.author: apimpm
2020

2121
Azure API Management supports multi-region deployment, which enables API publishers to distribute a single Azure API management service across any number of supported Azure regions. Multi-region feature helps reduce request latency perceived by geographically distributed API consumers and improves service availability if one region goes offline.
2222

23-
A new Azure API Management service initially contains only one [unit][unit] in a single Azure region, the Primary region. Additional regions can be added to the Primary or Secondary regions. An API Management gateway component is deployed to every selected Primary and Secondary region. Incoming API requests are automatically directed to the closest region. If a region goes offline, the API requests will be automatically routed around the failed region to the next closest gateway.
23+
A new Azure API Management service initially contains only one [unit][unit] in a single Azure region, the Primary region. Additional units can be added to the Primary or Secondary regions. An API Management gateway component is deployed to every selected Primary and Secondary region. Incoming API requests are automatically directed to the closest region. If a region goes offline, the API requests will be automatically routed around the failed region to the next closest gateway.
2424

2525
> [!NOTE]
2626
> Only the gateway component of API Management is deployed to all regions. The service management component and developer portal are hosted in the Primary region only. Therefore, in case of the Primary region outage, access to the developer portal and ability to change configuration (e.g. adding APIs, applying policies) will be impaired until the Primary region comes back online. While the Primary region is offline available Secondary regions will continue to serve the API traffic using the latest configuration available to them.

articles/app-service/containers/quickstart-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ In this section, you learn how to view (or "tail") the logs from the running App
150150

151151
Find the app in the **AZURE APP SERVICE** explorer, right-click the app, and choose **View Streaming Logs**.
152152

153-
When prompted, choose to enable logging and restart the application. Once the app is restarted, the VS Code output window opens with a connection to the log stream.
153+
The VS Code output window opens with a connection to the log stream.
154154

155155
![View Streaming Logs](./media/quickstart-nodejs/view-logs.png)
156156

0 commit comments

Comments
 (0)