Skip to content

Commit 9f632cd

Browse files
authored
Merge pull request #242309 from MicrosoftDocs/main
6/21/2023 10AM Publishing
2 parents 66db39c + e6a57ea commit 9f632cd

File tree

70 files changed

+538
-356
lines changed

Some content is hidden

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

70 files changed

+538
-356
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22203,6 +22203,16 @@
2220322203
"redirect_url": "/azure/active-directory/develop/zero-trust-for-developers",
2220422204
"redirect_document_id": false
2220522205
},
22206+
{
22207+
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-protocols.md",
22208+
"redirect_url": "/azure/active-directory/develop/v2-protocols",
22209+
"redirect_document_id": false
22210+
},
22211+
{
22212+
"source_path_from_root": "/articles/active-directory/develop/msal-net-aad-b2c-considerations.md",
22213+
"redirect_url": "/azure/active-directory/develop/msal-net-b2c-considerations",
22214+
"redirect_document_id": false
22215+
},
2220622216
{
2220722217
"source_path_from_root": "/articles/active-directory/develop/active-directory-how-applications-are-added.md",
2220822218
"redirect_url": "/azure/active-directory/develop/how-applications-are-added",

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,17 @@ Users can register for passwordless phone sign-in directly within the Microsoft
8787
6. Once signed-in, continue following the additional steps to set up phone sign-in.
8888

8989
### Guided registration with My Sign-ins
90+
> [!NOTE]
91+
> Users will only be able to register Microsoft Authenticator via combined registration if the Microsoft Authenticator authentication mode is to Any or Push.
92+
9093
To register the Microsoft Authenticator app, follow these steps:
9194

9295
1. Browse to [https://aka.ms/mysecurityinfo](https://aka.ms/mysecurityinfo).
9396
1. Sign in, then select **Add method** > **Authenticator app** > **Add** to add Microsoft Authenticator.
9497
1. Follow the instructions to install and configure the Microsoft Authenticator app on your device.
9598
1. Select **Done** to complete Microsoft Authenticator configuration.
9699

97-
### Enable phone sign-in
100+
#### Enable phone sign-in
98101

99102
After users registered themselves for the Microsoft Authenticator app, they need to enable phone sign-in:
100103

articles/active-directory/develop/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- name: Authentication vs. authorization
2222
href: authentication-vs-authorization.md
2323
- name: OAuth 2.0 and OpenID Connect
24-
href: active-directory-v2-protocols.md
24+
href: v2-protocols.md
2525
- name: App types and authentication flows
2626
displayName: Auth flows
2727
href: authentication-flows-app-scenarios.md
@@ -762,7 +762,7 @@
762762
- name: Integrate with AD FS
763763
href: msal-net-adfs-support.md
764764
- name: Integrate with Azure AD B2C
765-
href: msal-net-aad-b2c-considerations.md
765+
href: msal-net-b2c-considerations.md
766766
- name: Logging and error handling
767767
displayName: MSAL.NET
768768
items:

articles/active-directory/develop/msal-net-aad-b2c-considerations.md renamed to articles/active-directory/develop/msal-net-b2c-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ MSAL.NET supports a [token cache](/dotnet/api/microsoft.identity.client.tokencac
159159

160160
Currently, MSAL.NET needs two claims to build a token cache key:
161161

162-
- `tid` (the Azure AD tenant ID)
162+
- `tid` (the tenant ID)
163163
- `preferred_username`
164164

165165
Both of these claims may be missing in Azure AD B2C scenarios because not all social identity providers (Facebook, Google, and others) return them in the tokens they return to Azure AD B2C.
File renamed without changes.

articles/active-directory/fundamentals/parallel-identity-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Then when a Litware employee wishes to access a Contoso app, they can do so by a
219219

220220
### Option 8 - Configure B2B but with a common HR feed for both directories
221221

222-
In some situations, after acquisition the organization may converge on a single HR platform, but still run existing identity management systems. In this scenario, MIM could provision users into multiple Active Directory systems, depending on with part of the organization the user is affiliated with. They could continue to use B2B so that users authenticate their existing directory, and have a unified GAL.
222+
In some situations, after acquisition the organization may converge on a single HR platform, but still run existing identity management systems. In this scenario, MIM could provision users into multiple Active Directory systems, depending on which part of the organization the user is affiliated with. They could continue to use B2B so that users authenticate their existing directory, and have a unified GAL.
223223

224224
![Configure B2B users but with a common HR system feed](media/parallel-identity-options/identity-combined-8.png)
225225

articles/aks/azure-disk-csi.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,10 @@ Expand the PVC by increasing the `spec.resources.requests.storage` field running
288288
kubectl patch pvc pvc-azuredisk --type merge --patch '{"spec": {"resources": {"requests": {"storage": "15Gi"}}}}'
289289
```
290290

291+
> [!NOTE]
292+
> Shrinking persistent volumes is currently not supported. Trying to patch an existing PVC with a smaller size than the current one leads to the following error message:
293+
> `The persistentVolumeClaim "pvc-azuredisk" is invalid: spec.resources.requests.storage: Forbidden: field can not be less than previous value.`
294+
291295
The output of the command resembles the following example:
292296

293297
```output

articles/aks/network-observability-byo-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ az aks create \
134134
## Get cluster credentials
135135

136136
```azurecli-interactive
137-
az aks get-credentials -name myAKSCluster --resource-group myResourceGroup
137+
az aks get-credentials --name myAKSCluster --resource-group myResourceGroup
138138
```
139139

140140
## Enable Visualization on Grafana

articles/aks/network-observability-managed-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Use [az aks update](/cli/azure/aks#az-aks-update) to link the Azure Monitor and
182182
az aks update \
183183
--name myAKSCluster \
184184
--resource-group myResourceGroup \
185-
--enable-azuremonitormetrics \
185+
--enable-azure-monitor-metrics \
186186
--azure-monitor-workspace-resource-id $azuremonitorId \
187187
--grafana-resource-id $grafanaId
188188
```
@@ -192,7 +192,7 @@ az aks update \
192192
## Get cluster credentials
193193

194194
```azurecli-interactive
195-
az aks get-credentials -name myAKSCluster --resource-group myResourceGroup
195+
az aks get-credentials --name myAKSCluster --resource-group myResourceGroup
196196
```
197197

198198

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ View the upcoming version releases on the AKS Kubernetes release calendar. To se
4141
> [!NOTE]
4242
> AKS follows 12 months of support for a generally available (GA) Kubernetes version. To read more about our support policy for Kubernetes versioning, please read our [FAQ](./supported-kubernetes-versions.md#faq).
4343
44-
For the past release history, see [Kubernetes history](https://en.wikipedia.org/wiki/Kubernetes#History).
44+
For the past release history, see [Kubernetes history](https://github.com/kubernetes/kubernetes/releases).
4545

4646
| K8s version | Upstream release | AKS preview | AKS GA | End of life |
4747
|--------------|-------------------|--------------|---------|-------------|

0 commit comments

Comments
 (0)