Skip to content

Commit ead167d

Browse files
authored
Merge pull request #103349 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 7b06eac + 43077da commit ead167d

File tree

6 files changed

+28
-16
lines changed

6 files changed

+28
-16
lines changed

articles/aks/kubernetes-action.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ ms.author: atulmal
1414

1515
[GitHub Actions](https://help.github.com/en/articles/about-github-actions) gives you the flexibility to build an automated software development lifecycle workflow. The Kubernetes action [azure/aks-set-context@v1](https://github.com/Azure/aks-set-context) facilitate deployments to Azure Kubernetes Service clusters. The action sets the target AKS cluster context, which could be used by other actions like [azure/k8s-deploy](https://github.com/Azure/k8s-deploy/tree/master), [azure/k8s-create-secret](https://github.com/Azure/k8s-create-secret/tree/master) etc. or run any kubectl commands.
1616

17-
> [!IMPORTANT]
18-
> GitHub Actions is currently in beta. You must first [sign-up to join the preview](https://github.com/features/actions) using your GitHub account.
19-
>
20-
2117
A workflow is defined by a YAML (.yml) file in the `/.github/workflows/` path in your repository. This definition contains the various steps and parameters that make up the workflow.
2218

2319
For a workflow targeting AKS, the file has three sections:

articles/application-gateway/migrate-v1-v2.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ To run the script:
9797
* **appgwName: [String]: Optional**. This is a string you specify to use as the name for the new Standard_v2 or WAF_v2 gateway. If this parameter isn't supplied, the name of your existing v1 gateway will be used with the suffix *_v2* appended.
9898
* **sslCertificates: [PSApplicationGatewaySslCertificate]: Optional**. A comma-separated list of PSApplicationGatewaySslCertificate objects that you create to represent the SSL certs from your v1 gateway must be uploaded to the new v2 gateway. For each of your SSL certs configured for your Standard v1 or WAF v1 gateway, you can create a new PSApplicationGatewaySslCertificate object via the `New-AzApplicationGatewaySslCertificate` command shown here. You need the path to your SSL Cert file and the password.
9999
100-
This parameter is only optional if you don’t have HTTPS listeners configured for your v1 gateway or WAF. If you have at least one HTTPS listener setup, you must specify this parameter.
100+
This parameter is only optional if you don’t have HTTPS listeners configured for your v1 gateway or WAF. If you have at least one HTTPS listener setup, you must specify this parameter.
101101
102102
```azurepowershell
103103
$password = ConvertTo-SecureString <cert-password> -AsPlainText -Force
@@ -109,12 +109,17 @@ To run the script:
109109
-Password $password
110110
```
111111
112-
You can pass in `$mySslCert1, $mySslCert2` (comma-separated) in the previous example as values for this parameter in the script.
113-
* **trustedRootCertificates: [PSApplicationGatewayTrustedRootCertificate]: Optional**. A comma-separated list of PSApplicationGatewayTrustedRootCertificate objects that you create to represent the [Trusted Root certificates](ssl-overview.md) for authentication of your backend instances from your v2 gateway.
112+
You can pass in `$mySslCert1, $mySslCert2` (comma-separated) in the previous example as values for this parameter in the script.
113+
* **trustedRootCertificates: [PSApplicationGatewayTrustedRootCertificate]: Optional**. A comma-separated list of PSApplicationGatewayTrustedRootCertificate objects that you create to represent the [Trusted Root certificates](ssl-overview.md) for authentication of your backend instances from your v2 gateway.
114+
115+
```azurepowershell
116+
$certFilePath = ".\rootCA.cer"
117+
$trustedCert = New-AzApplicationGatewayTrustedRootCertificate -Name "trustedCert1" -CertificateFile $certFilePath
118+
```
114119
115120
To create a list of PSApplicationGatewayTrustedRootCertificate objects, see [New-AzApplicationGatewayTrustedRootCertificate](https://docs.microsoft.com/powershell/module/Az.Network/New-AzApplicationGatewayTrustedRootCertificate?view=azps-2.1.0&viewFallbackFrom=azps-2.0.0).
116121
* **privateIpAddress: [String]: Optional**. A specific private IP address that you want to associate to your new v2 gateway. This must be from the same VNet that you allocate for your new v2 gateway. If this isn't specified, the script allocates a private IP address for your v2 gateway.
117-
* **publicIpResourceId: [String]: Optional**. The resourceId of a public IP address (standard SKU) resource in your subscription that you want to allocate to the new v2 gateway. If this isn't specified, the script allocates a new public IP in the same resource group. The name is the v2 gateway’s name with *-IP* appended.
122+
* **publicIpResourceId: [String]: Optional**. The resourceId of existing public IP address (standard SKU) resource in your subscription that you want to allocate to the new v2 gateway. If this isn't specified, the script allocates a new public IP in the same resource group. The name is the v2 gateway’s name with *-IP* appended.
118123
* **validateMigration: [switch]: Optional**. Use this parameter if you want the script to do some basic configuration comparison validations after the v2 gateway creation and the configuration copy. By default, no validation is done.
119124
* **enableAutoScale: [switch]: Optional**. Use this parameter if you want the script to enable AutoScaling on the new v2 gateway after it's created. By default, AutoScaling is disabled. You can always manually enable it later on the newly created v2 gateway.
120125
@@ -127,10 +132,10 @@ To run the script:
127132
-resourceId /subscriptions/8b1d0fea-8d57-4975-adfb-308f1f4d12aa/resourceGroups/MyResourceGroup/providers/Microsoft.Network/applicationGateways/myv1appgateway `
128133
-subnetAddressRange 10.0.0.0/24 `
129134
-appgwname "MynewV2gw" `
130-
-sslCertificates $Certs `
135+
-sslCertificates $mySslCert1,$mySslCert2 `
131136
-trustedRootCertificates $trustedCert `
132137
-privateIpAddress "10.0.0.1" `
133-
-publicIpResourceId "MyPublicIP" `
138+
-publicIpResourceId "/subscriptions/8b1d0fea-8d57-4975-adfb-308f1f4d12aa/resourceGroups/MyResourceGroup/providers/Microsoft.Network/publicIPAddresses/MyPublicIP" `
134139
-validateMigration -enableAutoScale
135140
```
136141

articles/cognitive-services/QnAMaker/reference-markdown-format.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Following is the list of markdown formats that you can use in QnA Maker's answer
2020
A new line between 2 sentences.|`\n\n`|`How can I create a bot with \n\n QnA Maker?`|![format new line between two sentences](./media/qnamaker-concepts-datasources/format-newline.png)|
2121
|Headers from h1 to h6, the number of `#` denotes which header. 1 `#` is the h1.|`\n# text \n## text \n### text \n####text \n#####text` |`## Creating a bot \n ...text.... \n### Important news\n ...text... \n### Related Information\n ....text...`<br><br>`\n# my h1 \n## my h2\n### my h3 \n#### my h4 \n##### my h5`|![format with markdown headers](./media/qnamaker-concepts-datasources/format-headers.png)<br>![format with markdown headers H1 to H5](./media/qnamaker-concepts-datasources/format-h1-h5.png)|
2222
|Italics |`*text*`|`How do I create a bot with *QnA Maker*?`|![format with italics](./media/qnamaker-concepts-datasources/format-italics.png)|
23-
|String (bold)|`**text**`|`How do I create a bot with **QnA Maker**?`|![format with strong marking for bold](./media/qnamaker-concepts-datasources/format-strong.png)|
23+
|Strong (bold)|`**text**`|`How do I create a bot with **QnA Maker**?`|![format with strong marking for bold](./media/qnamaker-concepts-datasources/format-strong.png)|
2424
|URL for link|`[text](https://www.my.com)`|`How do I create a bot with [QnA Maker](https://www.qnamaker.ai)?`|![format for URL (hyperlink)](./media/qnamaker-concepts-datasources/format-url.png)|
2525
|*URL for public image|`![text](https://www.my.com/image.png)`|`How can I create a bot with ![QnAMaker](https://review.docs.microsoft.com/azure/cognitive-services/qnamaker/media/qnamaker-how-to-key-management/qnamaker-resource-list.png)`|![format for public image URL ](./media/qnamaker-concepts-datasources/format-image-url.png)|
2626
|Strikethrough|`~~text~~`|`some ~~questoins~~ questions need to be asked`|![format for strikethrough](./media/qnamaker-concepts-datasources/format-strikethrough.png)|
@@ -29,7 +29,7 @@ A new line between 2 sentences.|`\n\n`|`How can I create a bot with \n\n QnA Mak
2929
|Italics URL for link|`[*text*](https://www.my.com)`|`How do I create a bot with [*QnA Maker*](https://www.qnamaker.ai)?`|![format for italics URL](./media/qnamaker-concepts-datasources/format-url-italics.png)|
3030
|Escape markdown symbols|`\*text\*`|`How do I create a bot with \*QnA Maker\*?`|![format for italics URL](./media/qnamaker-concepts-datasources/format-escape-markdown-symbols.png)|
3131
|Ordered list|`\n 1. item1 \n 1. item2`|`This is an ordered list: \n 1. List item 1 \n 1. List item 2`<br>The preceding example uses automatic numbering built into markdown.<br>`This is an ordered list: \n 1. List item 1 \n 2. List item 2`<br>The preceding example uses explicit numbering.|![format for ordered list](./media/qnamaker-concepts-datasources/format-ordered-list.png)|
32-
|Unordered list|`\n * item1 \n * item2`<br>or<br>`\n - item1 \n - item2`|`This is an ordered list: \n * List item 1 \n * List item 2`|![format for unordered list](./media/qnamaker-concepts-datasources/format-unordered-list.png)|
32+
|Unordered list|`\n * item1 \n * item2`<br>or<br>`\n - item1 \n - item2`|`This is an unordered list: \n * List item 1 \n * List item 2`|![format for unordered list](./media/qnamaker-concepts-datasources/format-unordered-list.png)|
3333
|Nested lists|`\n * Parent1 \n\t * Child1 \n\t * Child2 \n * Parent2`<br><br>`\n * Parent1 \n\t 1. Child1 \n\t * Child2 \n 1. Parent2`<br><br>You can nest ordered and unordered lists together. The tab, `\t`, indicates the indentation level of the child element.|`This is an unordered list: \n * List item 1 \n\t * Child1 \n\t * Child2 \n * List item 2`<br><br>`This is an ordered nested list: \n 1. Parent1 \n\t 1. Child1 \n\t 1. Child2 \n 1. Parent2`|![format for nested unordered list](./media/qnamaker-concepts-datasources/format-nested-unordered-list.png)<br>![format for nested ordered list](./media/qnamaker-concepts-datasources/format-nested-ordered-list.png)|
3434

3535
*QnA Maker doesn't process the image in any way. It is the client application's role to render the image.
@@ -45,4 +45,4 @@ Additionally, CR LF(\r\n) are converted to \n in the KB. LF(\n) is kept as is. I
4545

4646
## Next steps
4747

48-
Review batch testing [file formats](reference-tsv-format-batch-testing.md).
48+
Review batch testing [file formats](reference-tsv-format-batch-testing.md).

articles/cost-management-billing/manage/mpa-request-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ You can request billing ownership of the subscription types listed below.
116116
- [Enterprise Dev/Test](https://azure.microsoft.com/offers/ms-azr-0148p/)\*
117117
- [Microsoft Enterprise Agreement](https://azure.microsoft.com/pricing/enterprise-agreement/)
118118

119-
\* Enterprise DevTest subscription will be billed at pay-as-you-go rate upon transferred, any discount offered via the Enterprise DevTest offer through the customer's EA will not be available to the CSP partner.
119+
\* A Dev/Test subscription must first be converted to an EA Enterprise offer via a support ticket. An Enterprise Dev/Test subscription will be billed at a pay-as-you-go rate after it's transferred. Any discount offered via the Enterprise Dev/Test offer through the customer's EA will not be available to the CSP partner.
120120

121121
## Additional information
122122

articles/governance/policy/concepts/definition-structure.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ms.topic: conceptual
66
---
77
# Azure Policy definition structure
88

9-
Resource policy definitions are used by Azure Policy to establish conventions for resources. Each
10-
definition describes resource compliance and what effect to take when a resource is non-compliant.
9+
Azure Policy establishes conventions for resources. Policy definitions describe resource compliance [conditions](#conditions) and the effect to take if a condition is met. A condition compares a resource property [field](#fields) to a required value. Resource property fields are accessed by using [aliases](#aliases). A resource property field is either a single-valued field or an [array](#understanding-the--alias) of multiple values. Condition evaluation is different on arrays. Learn more about [conditions](#conditions).
10+
1111
By defining conventions, you can control costs and more easily manage your resources. For example,
1212
you can specify that only certain types of virtual machines are allowed. Or, you can require that
1313
all resources have a particular tag. Policies are inherited by all child resources. If a policy is
@@ -74,6 +74,9 @@ are:
7474
- `all`: evaluate resource groups and all resource types
7575
- `indexed`: only evaluate resource types that support tags and location
7676

77+
For example, resource `Microsoft.Network/routeTables` supports tags and location and would be evaluated in both modes.
78+
However, resource `Microsoft.Network/routeTables/routes` cannot be tagged, and would not be evaluated in `Indexed` mode.
79+
7780
We recommend that you set **mode** to `all` in most cases. All policy definitions created through
7881
the portal use the `all` mode. If you use PowerShell or Azure CLI, you can specify the **mode**
7982
parameter manually. If the policy definition doesn't include a **mode** value, it defaults to `all`
@@ -309,6 +312,10 @@ are case-insensitive. Case-insensitive alternatives are available in **matchInse
309312
**notMatchInsensitively**. For examples, see
310313
[Allow several name patterns](../samples/allow-multiple-name-patterns.md).
311314

315+
In an **\[\*\] alias** array field value, every element in the
316+
array is evaluated individually, with logical AND between elements. For more information, see
317+
[Evaluating the \[\*\] alias](../how-to/author-policies-for-arrays.md#evaluating-the--alias).
318+
312319
### Fields
313320

314321
Conditions are formed by using fields. A field matches properties in the resource request payload

includes/notification-hubs-enable-apple-push-notifications.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Generate the Certificate Signing Request (CSR) file, which Apple uses to generat
2020
1. Select **Keychain Access**, expand **Certificate Assistant**, and then select **Request a Certificate from a Certificate Authority**.
2121

2222
![Use Keychain Access to request a new certificate](./media/notification-hubs-enable-apple-push-notifications/notification-hubs-request-cert-from-ca.png)
23+
24+
> [!NOTE]
25+
> OS X by default selects the first item in the category that you have selected in the Keychain Access tool. This might be problematic if you’re in the **Certificates** section and **Apple Worldwide Developer Relations Certification Authority** is *not* the first item in the list. Before you request a certificate, be sure that you’re in the **Certificates** section, and then select **Apple Worldwide Developer Relations Certification Authority**.
26+
2327

2428
1. Select your **User Email Address**, enter your **Common Name** value, make sure that you specify **Saved to disk**, and then select **Continue**. Leave **CA Email Address** blank as it isn't required.
2529

0 commit comments

Comments
 (0)