Skip to content

Commit 3f10a87

Browse files
authored
Merge pull request #189127 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 79e554a + 43c52c8 commit 3f10a87

File tree

5 files changed

+25
-62
lines changed

5 files changed

+25
-62
lines changed

articles/active-directory/develop/active-directory-certificate-credentials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To compute the assertion, you can use one of the many JWT libraries in the langu
4040

4141
Claim type | Value | Description
4242
---------- | ---------- | ----------
43-
`aud` | `https://login.microsoftonline.com/{tenantId}/v2.0` | The "aud" (audience) claim identifies the recipients that the JWT is intended for (here Azure AD) See [RFC 7519, Section 4.1.3](https://tools.ietf.org/html/rfc7519#section-4.1.3). In this case, that recipient is the login server (login.microsoftonline.com).
43+
`aud` | `https://login.microsoftonline.com/{tenantId}/V2.0/token` | The "aud" (audience) claim identifies the recipients that the JWT is intended for (here Azure AD) See [RFC 7519, Section 4.1.3](https://tools.ietf.org/html/rfc7519#section-4.1.3). In this case, that recipient is the login server (login.microsoftonline.com).
4444
`exp` | 1601519414 | The "exp" (expiration time) claim identifies the expiration time on or after which the JWT MUST NOT be accepted for processing. See [RFC 7519, Section 4.1.4](https://tools.ietf.org/html/rfc7519#section-4.1.4). This allows the assertion to be used until then, so keep it short - 5-10 minutes after `nbf` at most. Azure AD does not place restrictions on the `exp` time currently.
4545
`iss` | {ClientID} | The "iss" (issuer) claim identifies the principal that issued the JWT, in this case your client application. Use the GUID application ID.
4646
`jti` | (a Guid) | The "jti" (JWT ID) claim provides a unique identifier for the JWT. The identifier value MUST be assigned in a manner that ensures that there is a negligible probability that the same value will be accidentally assigned to a different data object; if the application uses multiple issuers, collisions MUST be prevented among values produced by different issuers as well. The "jti" value is a case-sensitive string. [RFC 7519, Section 4.1.7](https://tools.ietf.org/html/rfc7519#section-4.1.7)
@@ -62,7 +62,7 @@ The signature is computed by applying the certificate as described in the [JSON
6262
}
6363
.
6464
{
65-
"aud": "https: //login.microsoftonline.com/contoso.onmicrosoft.com/oauth2/token",
65+
"aud": "https: //login.microsoftonline.com/contoso.onmicrosoft.com/oauth2/V2.0/token",
6666
"exp": 1484593341,
6767
"iss": "97e0a5b7-d745-40b6-94fe-5f77d35c6e05",
6868
"jti": "22b3bb26-e046-42df-9c96-65dbd72c1c81",

articles/azure-monitor/app/ip-addresses.md

Lines changed: 15 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -86,108 +86,66 @@ Download [China Cloud IP addresses](https://www.microsoft.com/download/details.a
8686
```
8787
Australia East
8888
20.40.124.176/28
89-
20.40.124.240/28
90-
20.40.125.80/28
89+
9190
9291
Brazil South
9392
191.233.26.176/28
94-
191.233.26.128/28
95-
191.233.26.64/28
93+
9694
9795
France Central (Formerly France South)
9896
20.40.129.96/28
99-
20.40.129.112/28
100-
20.40.129.128/28
101-
20.40.129.144/28
97+
10298
10399
France Central
104100
20.40.129.32/28
105-
20.40.129.48/28
106-
20.40.129.64/28
107-
20.40.129.80/28
101+
108102
109103
East Asia
110104
52.229.216.48/28
111-
52.229.216.64/28
112-
52.229.216.80/28
105+
113106
114107
North Europe
115108
52.158.28.64/28
116-
52.158.28.80/28
117-
52.158.28.96/28
118-
52.158.28.112/28
109+
119110
120111
Japan East
121112
52.140.232.160/28
122-
52.140.232.176/28
123-
52.140.232.192/28
113+
124114
125115
West Europe
126116
51.144.56.96/28
127-
51.144.56.112/28
128-
51.144.56.128/28
129-
51.144.56.144/28
130-
51.144.56.160/28
131-
51.144.56.176/28
117+
132118
133119
UK South
134120
51.105.9.128/28
135-
51.105.9.144/28
136-
51.105.9.160/28
121+
137122
138123
UK West
139124
20.40.104.96/28
140-
20.40.104.112/28
141-
20.40.104.128/28
142-
20.40.104.144/28
125+
143126
144127
Southeast Asia
145128
52.139.250.96/28
146-
52.139.250.112/28
147-
52.139.250.128/28
148-
52.139.250.144/28
129+
149130
150131
West US
151132
40.91.82.48/28
152-
40.91.82.64/28
153-
40.91.82.80/28
154-
40.91.82.96/28
155-
40.91.82.112/28
156-
40.91.82.128/28
133+
157134
158135
Central US
159136
13.86.97.224/28
160-
13.86.97.240/28
161-
13.86.98.48/28
162-
13.86.98.0/28
163-
13.86.98.16/28
164-
13.86.98.64/28
137+
165138
166139
North Central US
167140
23.100.224.16/28
168-
23.100.224.32/28
169-
23.100.224.48/28
170-
23.100.224.64/28
171-
23.100.224.80/28
172-
23.100.224.96/28
173-
23.100.224.112/28
174-
23.100.225.0/28
141+
175142
176143
South Central US
177144
20.45.5.160/28
178-
20.45.5.176/28
179-
20.45.5.192/28
180-
20.45.5.208/28
181-
20.45.5.224/28
182-
20.45.5.240/28
183145
184146
East US
185147
20.42.35.32/28
186-
20.42.35.64/28
187-
20.42.35.80/28
188-
20.42.35.96/28
189-
20.42.35.112/28
190-
20.42.35.128/28
148+
191149
192150
```
193151

articles/virtual-machines/nd-series-retirement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ After 31 August 2022, any remaining ND size virtual machines remaining in your s
1919
This VM size retirement only impacts the VM sizes in the [ND-series](nd-series.md). This does not impact the newer [NCv3](ncv3-series.md), [NC T4 v3](nct4-v3-series.md), and [ND v2](ndv2-series.md) series virtual machines.
2020

2121
## What actions should I take?
22-
You will need to resize or deallocate your NC virtual machines. We recommend moving your GPU workloads to another GPU Virtual Machine size. Learn more about migrating your workloads to another [GPU Accelerated Virtual Machine size](sizes-gpu.md).
22+
You will need to resize or deallocate your ND virtual machines. We recommend moving your GPU workloads to another GPU Virtual Machine size. Learn more about migrating your workloads to another [GPU Accelerated Virtual Machine size](sizes-gpu.md).
2323

2424
## Next steps
2525
[Learn more](n-series-migration.md) about migrating your workloads to other GPU Azure Virtual Machine sizes.

articles/virtual-machines/virtual-machines-create-restore-points.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ You can protect your data and guard against extended downtime by creating virtua
1818

1919
## About VM restore points
2020

21-
An individual VM restore point stores the VM configuration and a disk restore point for each attached disk. A disk restore point consists of a snapshot of an individual managed disk.
21+
An individual VM restore point is a resource that stores VM configuration and point-in-time application consistent snapshots of all the managed disks attached to the VM. VM restore points can be leveraged to easily capture multi-disk consistent backups. VM restore points contains a disk restore point for each of the attached disks. A disk restore point consists of a snapshot of an individual managed disk.
22+
23+
VM restore points support application consistency for VMs running Windows operating systems and support file system consistency for VMs running Linux operating system. Application consistent restore points use VSS writers (or pre/post scripts for Linux) to ensure the consistency of the application data before a restore point is created. To get an application consistent restore point the application running in the VM needs to provide a VSS writer (for Windows) or pre and post scripts (for Linux) to achieve application consistency.
2224

2325
VM restore points are organized into restore point collections. A restore point collection is an Azure Resource Management resource that contains the restore points for a specific VM. If you want to utilize ARM templates for creating restore points and restore point collections, visit the public [Virtual-Machine-Restore-Points](https://github.com/Azure/Virtual-Machine-Restore-Points) repository on GitHub.
2426

articles/vpn-gateway/nat-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ NAT on a gateway device translates the source and/or destination IP addresses, b
3434

3535
* **Dynamic NAT**: For dynamic NAT, an IP address can be translated to different target IP addresses based on availability, or with a different combination of IP address and TCP/UDP port. The latter is also called NAPT, Network Address and Port Translation. Dynamic rules will result in stateful translation mappings depending on the traffic flows at any given time.
3636

37+
> [!NOTE]
38+
> When Dynamic NAT rules are used, traffic is unidirectional which means communication must be initiated from the site that is represented in the Internal Mapping field of the rule. If traffic is initiated from the External Mapping, the connection will not be established. If you require bidirectional traffic initiation, then use a static NAT rule to define a 1:1 mapping.
39+
3740
Another consideration is the address pool size for translation. If the target address pool size is the same as the original address pool, use static NAT rule to define a 1:1 mapping in a sequential order. If the target address pool is smaller than the original address pool, use dynamic NAT rule to accommodate the differences.
3841

3942
> [!IMPORTANT]
@@ -123,4 +126,4 @@ To implement the NAT configuration as shown above, first create the NAT rules in
123126

124127
## Next steps
125128

126-
See [Configure NAT on Azure VPN gateways](nat-howto.md) for steps to configure NAT for your cross-premises connections.
129+
See [Configure NAT on Azure VPN gateways](nat-howto.md) for steps to configure NAT for your cross-premises connections.

0 commit comments

Comments
 (0)