Skip to content

Commit 0c47a2b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into prvlink-review
2 parents b699dc8 + 046072a commit 0c47a2b

File tree

53 files changed

+235
-187
lines changed

Some content is hidden

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

53 files changed

+235
-187
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22376,6 +22376,11 @@
2237622376
"redirect_url": "/azure/azure-arc/kubernetes/overview",
2237722377
"redirect_document_id": "false"
2237822378
},
22379+
{
22380+
"source_path_from_root": "/articles/azure-arc/kubernetes/tutorial-workload-management.md",
22381+
"redirect_url": "/azure/azure-arc/kubernetes/workload-management",
22382+
"redirect_document_id": "true"
22383+
},
2237922384
{
2238022385
"source_path": "articles/azure-cache-for-redis/redis-cache-insights-overview.md",
2238122386
"redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",

articles/aks/learn/quick-kubernetes-deploy-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Two [Kubernetes Services][kubernetes-service] are also created:
179179
* An external service to access the Azure Vote application from the internet.
180180

181181
1. Create a file named `azure-vote.yaml`.
182-
* If you use the Azure Cloud Shell, this file can be created using `code`, `vi`, or `nano` as if working on a virtual or physical system
182+
183183
1. Copy in the following YAML definition:
184184

185185
```yaml

articles/aks/learn/quick-kubernetes-deploy-cli.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ Two [Kubernetes Services][kubernetes-service] are also created:
139139
140140
1. Create a file named `azure-vote.yaml` and copy in the following manifest.
141141
142-
* If you use the Azure Cloud Shell, this file can be created using `code`, `vi`, or `nano` as if working on a virtual or physical system.
143-
142+
144143
```yaml
145144
apiVersion: apps/v1
146145
kind: Deployment

articles/aks/learn/quick-kubernetes-deploy-portal.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,8 @@ Two Kubernetes Services are also created:
129129
* An internal service for the Redis instance.
130130
* An external service to access the Azure Vote application from the internet.
131131
132-
1. In the Cloud Shell, use an editor to create a file named `azure-vote.yaml`, such as:
133-
* `code azure-vote.yaml`
134-
* `nano azure-vote.yaml`, or
135-
* `vi azure-vote.yaml`.
136-
137-
1. Copy in the following YAML definition:
132+
1. In the Cloud Shell, open an editor and create a file named `azure-vote.yaml`.
133+
2. Paste in the following YAML definition:
138134
139135
```yaml
140136
apiVersion: apps/v1

articles/aks/learn/quick-kubernetes-deploy-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Two [Kubernetes Services][kubernetes-service] are also created:
119119
* An external service to access the Azure Vote application from the internet.
120120
121121
1. Create a file named `azure-vote.yaml`.
122-
* If you use the Azure Cloud Shell, this file can be created using `code`, `vi`, or `nano` as if working on a virtual or physical system
122+
123123
1. Copy in the following YAML definition:
124124
125125
```yaml

articles/aks/learn/quick-kubernetes-deploy-rm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Two [Kubernetes Services][kubernetes-service] are also created:
177177
* An external service to access the Azure Vote application from the internet.
178178

179179
1. Create a file named `azure-vote.yaml`.
180-
* If you use the Azure Cloud Shell, this file can be created using `code`, `vi`, or `nano` as if working on a virtual or physical system
180+
181181
1. Copy in the following YAML definition:
182182

183183
```yaml

articles/api-management/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@
452452
href: invoke-dapr-binding-policy.md
453453
- name: ip-filter
454454
href: ip-filter-policy.md
455+
- name: jsonp
456+
href: jsonp-policy.md
455457
- name: json-to-xml
456458
href: json-to-xml-policy.md
457459
- name: limit-concurrency

articles/api-management/json-to-xml-policy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ The `json-to-xml` policy converts a request or response body from JSON to XML.
3131

3232
| Attribute | Description | Required | Default |
3333
| ----------------- | ------------------------------------------------------ | -------- | ------- |
34-
|apply|The attribute must be set to one of the following values.<br /><br /> - `always` - always apply conversion.<br />- `content-type-json` - convert only if response Content-Type header indicates presence of JSON.|Yes|N/A|
35-
|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> - `true` - apply conversion if XML is requested in request Accept header.<br />- `false` - always apply conversion.|No|`true`|
36-
|parse-date|When set to `false` date values are simply copied during transformation.|No|`true`|
37-
|namespace-separator|The character to use as a namespace separator.|No|Underscore|
38-
|namespace-prefix|The string that identifies property as namespace attribute, usually "xmlns". Properties with names beginning with specified prefix will be added to current element as namespace declarations.|No|N/A|
39-
|attribute-block-name|When set, properties inside the named object will be added to the element as attributes|No|Not set|
34+
|apply|The attribute must be set to one of the following values.<br /><br /> - `always` - always apply conversion.<br />- `content-type-json` - convert only if response Content-Type header indicates presence of JSON.<br/><br/>Policy expressions are allowed.|Yes|N/A|
35+
|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> - `true` - apply conversion if XML is requested in request Accept header.<br />- `false` - always apply conversion.<br/><br/>Policy expressions are allowed.|No|`true`|
36+
|parse-date|When set to `false` date values are simply copied during transformation. Policy expressions aren't allowed.|No|`true`|
37+
|namespace-separator|The character to use as a namespace separator. Policy expressions are allowed.|No|Underscore|
38+
|namespace-prefix|The string that identifies property as namespace attribute, usually "xmlns". Properties with names beginning with specified prefix will be added to current element as namespace declarations. Policy expressions are allowed.|No|N/A|
39+
|attribute-block-name|When set, properties inside the named object will be added to the element as attributes. Policy expressions are allowed.|No|Not set|
4040

4141
## Usage
4242

articles/api-management/jsonp-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The `jsonp` policy adds JSON with padding (JSONP) support to an operation or an
2626

2727
|Name|Description|Required|Default|
2828
|----------|-----------------|--------------|-------------|
29-
|callback-parameter-name|The cross-domain JavaScript function call prefixed with the fully qualified domain name where the function resides.|Yes|N/A|
29+
|callback-parameter-name|The cross-domain JavaScript function call prefixed with the fully qualified domain name where the function resides. Policy expressions are allowed.|Yes|N/A|
3030

3131
## Usage
3232

articles/api-management/limit-concurrency-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ The `limit-concurrency` policy prevents enclosed policies from executing by more
2828

2929
| Attribute | Description | Required | Default |
3030
| --------- | -------------------------------------------------------------------------------------------------- | -------- | ------- |
31-
| key | A string. Policy expression allowed. Specifies the concurrency scope. Can be shared by multiple policies. | Yes | N/A |
32-
| max-count | An integer. Specifies a maximum number of requests that are allowed to enter the policy. | Yes | N/A |
31+
| key | A string. Specifies the concurrency scope. Can be shared by multiple policies. Policy expressions are allowed. | Yes | N/A |
32+
| max-count | An integer. Specifies a maximum number of requests that are allowed to enter the policy. Policy expressions aren't allowed. | Yes | N/A |
3333

3434

3535
## Usage

0 commit comments

Comments
 (0)