Skip to content

Commit 2b62747

Browse files
authored
Merge pull request #300850 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 d0ba4e1 + d102ffe commit 2b62747

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

articles/cdn/cdn-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For a list of current content delivery network node locations, see [Azure Conten
3939

4040
3. The origin server returns the file to an edge server in the POP.
4141

42-
4. An edge server in the POP caches the file and returns the file to the original requestor (Alice). The file remains cached on the edge server in the POP until the time to live (TTL) specified by its HTTP headers expires. If the origin server didn't specify a TTL, the default TTL is seven days.
42+
4. An edge server in the POP caches the file and returns the file to the original requester (Alice). The file remains cached on the edge server in the POP until the time to live (TTL) specified by its HTTP headers expires. If the origin server didn't specify a TTL, the default TTL is seven days.
4343

4444
5. More users can then request the same file by using the same URL that Alice used, and gets directed to the same POP.
4545

articles/cdn/cdn-standard-rules-engine-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Use this action to redirect clients to a new URL.
8686

8787
Field | Description
8888
------|------------
89-
Type | Select the response type to return to the requestor: Found (302), Moved (301), Temporary redirect (307), and Permanent redirect (308).
89+
Type | Select the response type to return to the requester: Found (302), Moved (301), Temporary redirect (307), and Permanent redirect (308).
9090
Protocol | Match Request, HTTP, HTTPS.
9191
Hostname | Select the host name you want the request to be redirected to. Leave blank to preserve the incoming host.
9292
Path | Define the path to use in the redirect. Leave blank to preserve the incoming path.

articles/frontdoor/front-door-rules-engine-actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ Use the **URL redirect** action to redirect clients to a new URL. Clients are se
359359

360360
| Property | Supported values |
361361
|----------|------------------|
362-
| Redirect type | The response type to return to the requestor. <ul><li>In the Azure portal: Found (302), Moved (301), Temporary Redirect (307), Permanent Redirect (308).</li><li>In ARM templates: `Found`, `Moved`, `TemporaryRedirect`, `PermanentRedirect`</li></ul> |
362+
| Redirect type | The response type to return to the requester. <ul><li>In the Azure portal: Found (302), Moved (301), Temporary Redirect (307), Permanent Redirect (308).</li><li>In ARM templates: `Found`, `Moved`, `TemporaryRedirect`, `PermanentRedirect`</li></ul> |
363363
| Redirect protocol | <ul><li>In the Azure portal: `Match Request`, `HTTP`, `HTTPS`</li><li>In ARM templates: `MatchRequest`, `Http`, `Https`</li></ul> |
364364
| Destination host | The host name you want the request to be redirected to. Leave blank to preserve the incoming host. |
365365
| Destination path | The path to use in the redirect. Include the leading `/`. Leave blank to preserve the incoming path. |

articles/internet-peering/faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Peering connections that were set up outside of the automated portal process and
2929

3030
### When will peering IP addresses be allocated and displayed in the Azure portal?
3131

32-
Our automated process allocates IP addresses and sends the information via email to the PNI requestor after the port is configured on our side. This may take up to a week after the request has been submitted as the port has been cabled before it can be configured.
32+
Our automated process allocates IP addresses and sends the information via email to the PNI requester after the port is configured on our side. This may take up to a week after the request has been submitted as the port has been cabled before it can be configured.
3333

3434
### What Microsoft routes will be advertised over Peering Service connections?
3535

articles/web-application-firewall/afds/waf-sensitive-data-protection-configure-frontdoor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following table shows examples of log scrubbing rules that can be used to pr
2929

3030
<sup>1</sup> If a request triggers a rule that scans the request body, and the content type is either `application/x-www-form-urlencoded` or `application/json`, the WAF will scrub all request details from the logs to prevent any potential storage of PII.
3131

32-
<sup>2</sup> Request IP Address and Request URI rules only support the *equals any* operator and scrubs all instances of the requestor's IP address that appears in the WAF logs.
32+
<sup>2</sup> Request IP Address and Request URI rules only support the *equals any* operator and scrubs all instances of the requester's IP address that appears in the WAF logs.
3333

3434
For more information, see [What is Azure Web Application Firewall on Azure Front Door Sensitive Data Protection?](waf-sensitive-data-protection-frontdoor.md)
3535

articles/web-application-firewall/ag/waf-sensitive-data-protection-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following table shows examples of log scrubbing rules that can be used to pr
2929
| Request JSON Arg Names | Equals | Jsonarg | "data":"Matched Data: ****** found within ARGS:jsonarg: ******" |
3030
| Request IP Address* | Equals Any | NULL | "clientIp":"******" |
3131

32-
\* Request IP Address rules only support the *equals any* operator and scrubs all instances of the requestor's IP address that appears in the WAF logs.
32+
\* Request IP Address rules only support the *equals any* operator and scrubs all instances of the requester's IP address that appears in the WAF logs.
3333

3434
For more information, see [What is Azure Web Application Firewall Sensitive Data Protection?](waf-sensitive-data-protection.md)
3535

0 commit comments

Comments
 (0)