Skip to content

Commit 4be20ff

Browse files
authored
Merge pull request #104525 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 3fd457b + 8d4995f commit 4be20ff

16 files changed

+30
-24
lines changed

articles/active-directory/develop/scenario-web-app-sign-user-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ In ASP.NET Core, these settings are located in the [appsettings.json](https://gi
9090
// - "organizations" to sign in users in any work or school account
9191
// - "common" to sign in users with any work or school account or Microsoft personal account
9292
// - "consumers" to sign in users with a Microsoft personal account only
93-
"TenantId": "[Enter the tenantId here]]",
93+
"TenantId": "[Enter the tenantId here]",
9494

9595
// Client ID (application ID) obtained from the Azure portal
9696
"ClientId": "[Enter the Client Id]",

articles/active-directory/managed-identities-azure-resources/qs-configure-template-windows-vmss.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ In this section, you assign a user-assigned managed identity to a virtual machin
185185
"identity": {
186186
"type": "userAssigned",
187187
"identityIds": [
188-
"[resourceID('Micrososft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
188+
"[resourceID('Microsoft.ManagedIdentity/userAssignedIdentities/',variables('<USERASSIGNEDIDENTITY>'))]"
189189
]
190190
}
191191

articles/aks/supported-kubernetes-versions.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ When a new minor version is introduced, the oldest minor version and patch relea
7171
1.13.f
7272
```
7373

74-
And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and out of support.
74+
And AKS releases 1.16.*, this means that the 1.13.* versions (all 1.13 versions) will be removed and are out of support.
7575

7676
> [!NOTE]
7777
> Please note, that if customers are running an unsupported Kubernetes version, they will be asked to upgrade when
@@ -102,8 +102,7 @@ New Supported Version List
102102
* Customers have **30 days** from the public notification date to upgrade to a supported minor version release.
103103
* For new **patch** versions of Kubernetes
104104
* All users are notified of the new patch version being released and to upgrade to the latest patch release.
105-
* Users have **30 days** to upgrade to a newer, supported patch release. Users have **30 days** to upgrade to
106-
a supported patch release before the oldest is removed.
105+
* Users have **30 days** to upgrade to a newer, supported patch release before the oldest is removed.
107106

108107
AKS defines a "released version" as the generally available versions, enabled in all SLO / Quality of Service measurements and available in all regions. AKS may also support preview versions which are explicitly labeled and subject to Preview terms and conditions.
109108

@@ -147,11 +146,11 @@ az aks get-versions --location eastus --output table
147146
If you are on the *n-3* version, you are outside of support and will be asked to upgrade. If your upgrade from version n-3 to n-2 succeeds, you are now within our support policies. For example:
148147

149148
- If the oldest supported AKS version is are *1.13.a* and you are on *1.12.b* or older, you are outside of support.
150-
- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back in the within our support policies.
149+
- If the upgrade from *1.12.b* to *1.13.a* or higher succeeds, you are back within our support policies.
151150

152151
Upgrades to versions older than the supported window of *N-2* are not supported. In such cases, we recommend customers create new AKS clusters and redeploy their workloads with versions in the supported window.
153152

154-
**What does 'Out of Support' mean**
153+
**What does 'Outside of Support' mean**
155154

156155
'Outside of Support' means that the version you are running is outside of the supported versions list, and you will be
157156
asked to upgrade the cluster to a supported version when requesting support. Additionally, AKS does not make any

articles/azure-app-configuration/concept-key-value.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The usage of configuration data within application frameworks might dictate spec
2020

2121
Keys stored in App Configuration are case-sensitive, unicode-based strings. The keys *app1* and *App1* are distinct in an App Configuration store. Keep this in mind when you use configuration settings within an application because some frameworks handle configuration keys case-insensitively. For example, the ASP.NET Core configuration system treats keys as case-insensitive strings. To avoid unpredictable behaviors when you query App Configuration within an ASP.NET Core application, don't use keys that differ only by casing.
2222

23-
You can use any unicode character in key names entered into App Configuration except for `*`, `,`, and `\`. These characters are reserved. If you need to include a reserved character, you must escape it by using `\{Reserved Character}`. There's a combined size limit of 10,000 characters on a key-value pair. This limit includes all characters in the key, its value, and all associated optional attributes. Within this limit, you can have many hierarchical levels for keys.
23+
You can use any unicode character in key names entered into App Configuration except for `*`, `,`, and `\`. These characters are reserved. If you need to include a reserved character, you must escape it by using `\{Reserved Character}`. There's a combined size limit of 10 KB on a key-value pair. This limit includes all characters in the key, its value, and all associated optional attributes. Within this limit, you can have many hierarchical levels for keys.
2424

2525
### Design key namespaces
2626

@@ -46,7 +46,7 @@ Here are several examples of how you can structure your key names into a hierarc
4646

4747
### Label keys
4848

49-
Key values in App Configuration can optionally have a label attribute. Labels are used to differentiate key values with the same key. A key *app1* with labels *A* and *B* forms two separate keys in an App Configuration store. By default, the label for a key value is empty, or `null`.
49+
Key values in App Configuration can optionally have a label attribute. Labels are used to differentiate key values with the same key. A key *app1* with labels *A* and *B* forms two separate keys in an App Configuration store. By default, a key value has no label. To explicitly reference a key value without a label, use `\0` (URL encoded as `%00`).
5050

5151
Label provides a convenient way to create variants of a key. A common use of labels is to specify multiple environments for the same key:
5252

@@ -69,8 +69,6 @@ Each key value is uniquely identified by its key plus a label that can be `null`
6969
| `key` is omitted or `key=*` | Matches all keys |
7070
| `key=abc` | Matches key name **abc** exactly |
7171
| `key=abc*` | Matches key names that start with **abc** |
72-
| `key=*abc` | Matches key names that end with **abc** |
73-
| `key=*abc*` | Matches key names that contain **abc** |
7472
| `key=abc,xyz` | Matches key names **abc** or **xyz**, limited to five CSVs |
7573

7674
You also can include the following label patterns:
@@ -81,8 +79,6 @@ You also can include the following label patterns:
8179
| `label=%00` | Matches `null` label |
8280
| `label=1.0.0` | Matches label **1.0.0** exactly |
8381
| `label=1.0.*` | Matches labels that start with **1.0.** |
84-
| `label=*.0.0` | Matches labels that end with **.0.0** |
85-
| `label=*.0.*` | Matches labels that contain **.0.** |
8682
| `label=%00,1.0.0` | Matches labels `null` or **1.0.0**, limited to five CSVs |
8783

8884
## Values

articles/azure-monitor/platform/diagnostics-extension-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Following are the paths to some important logs and artifacts. We refer to this i
4747
| **MonAgentHost log file** | C:\WindowsAzure\Logs\Plugins\Microsoft.Azure.Diagnostics.IaaSDiagnostics\<DiagnosticsVersion>\WAD0107\Configuration\MonAgentHost.<seq_num>.log |
4848

4949
## Metric data doesn't appear in the Azure portal
50-
Azure Diagnostics provides metric data that can be displayed in the Azure portal. If you have problems seeing the data in portal, check the WADMetrics\* table in the Azure Diagnostics storage account to see if the corresponding metric records are there.
50+
Azure Diagnostics provides metric data that can be displayed in the Azure portal. If you have problems seeing the data in portal, check the WADMetrics\* table in the Azure Diagnostics storage account to see if the corresponding metric records are there and ensure that the [resource provider](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-supported-services) Microsoft.Insights is registered.
5151

5252
Here, the **PartitionKey** of the table is the resource ID, virtual machine, or virtual machine scale set. **RowKey** is the metric name (also known as the performance counter name).
5353

articles/backup/backup-azure-backup-cloud-as-tape.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 04/30/2017
99
Azure Backup and System Center Data Protection Manager customers can:
1010

1111
* Back up data in schedules which best suit the organizational needs.
12-
* Retain the backup data for longer periods
12+
* Retain the backup data for longer periods.
1313
* Make Azure a part of their long-term retention needs (instead of tape).
1414

1515
This article explains how customers can enable backup and retention policies. Customers who use tapes to address their long-term-retention needs now have a powerful and viable alternative with the availability of this feature. The feature is enabled in the latest release of the Azure Backup (which is available [here](https://aka.ms/azurebackup_agent)). System Center DPM customers must update to, at least, DPM 2012 R2 UR5 before using DPM with the Azure Backup service.
@@ -37,9 +37,9 @@ The total number of “retention points” specified in this policy is 90 (daily
3737
![Sample Screen](./media/backup-azure-backup-cloud-as-tape/samplescreen.png)
3838

3939
1. **Daily retention policy**: Backups taken daily are stored for seven days.
40-
2. **Weekly retention policy**: Backups taken every day at midnight and 6PM Saturday are preserved for four weeks
41-
3. **Monthly retention policy**: Backups taken at midnight and 6pm on the last Saturday of each month are preserved for 12 months
42-
4. **Yearly retention policy**: Backups taken at midnight on the last Saturday of every March are preserved for 10 years
40+
2. **Weekly retention policy**: Backups taken at midnight and 6 PM Saturday are preserved for four weeks.
41+
3. **Monthly retention policy**: Backups taken at midnight and 6 PM on the last Saturday of each month are preserved for 12 months.
42+
4. **Yearly retention policy**: Backups taken at midnight on the last Saturday of every March are preserved for 10 years.
4343

4444
The total number of “retention points” (points from which a customer can restore data) in the preceding diagram is computed as follows:
4545

articles/cognitive-services/Speech-Service/sovereign-clouds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Located in China, an Azure data center with direct access to China Mobile, China
4949
- Regions: China East 2 (Shanghai)
5050
- SR in SpeechSDK: *config.FromHost("wss://chinaeast2.stt.speech.azure.cn", "\<your-key\>");*
5151
- TTS in SpeechSDK: *config.FromHost("https[]()://chinaeast2.tts.speech.azure.cn", "\<your-key\>");*
52-
- Authentication Tokens: https[]()://chinaeast2.api.cognitive.microsoft.cn/sts/v1.0/issueToken
52+
- Authentication Tokens: https[]()://chinaeast2.api.cognitive.azure.cn/sts/v1.0/issueToken
5353
- Azure Portal: https://portal.azure.cn
5454
- Custom Speech Portal: https://chinaeast2.cris.azure.cn/Home/CustomSpeech
5555
- Available SKUs: S0

articles/data-explorer/ingest-data-event-grid.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ Save the data into a file and upload it with this script:
155155
echo "Done"
156156
```
157157

158+
> [!NOTE]
159+
> Azure Data Explorer won't delete the blobs post ingestion.
160+
> Retain the blobs for thrre to five days.
161+
> Use [Azure Blob storage lifecycle](https://docs.microsoft.com/azure/storage/blobs/storage-lifecycle-management-concepts?tabs=azure-portal) to manage blob deletion.
162+
158163
## Review the data flow
159164

160165
> [!NOTE]

articles/key-vault/key-vault-network-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This article provides step-by-step instructions to configure Azure Key Vault fir
2121
Here's how to configure Key Vault firewalls and virtual networks by using the Azure portal:
2222

2323
1. Browse to the key vault you want to secure.
24-
2. Select **Firewalls and virtual networks**.
24+
2. Select **Networking**, and then select the **Firewalls and virtual networks** tab.
2525
3. Under **Allow access from**, select **Selected networks**.
2626
4. To add existing virtual networks to firewalls and virtual network rules, select **+ Add existing virtual networks**.
2727
5. In the new blade that opens, select the subscription, virtual networks, and subnets that you want to allow access to this key vault. If the virtual networks and subnets you select don't have service endpoints enabled, confirm that you want to enable service endpoints, and select **Enable**. It might take up to 15 minutes to take effect.

articles/mariadb/howto-configure-privatelink-cli.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Connect to the VM *myVm* from the internet as follows:
127127

128128
1. Select **Download RDP File**. Azure creates a Remote Desktop Protocol (*.rdp*) file and downloads it to your computer.
129129

130-
1. Open the downloaded.rdp* file.
130+
1. Open the *downloaded.rdp* file.
131131

132132
1. If prompted, select **Connect**.
133133

@@ -155,6 +155,7 @@ Connect to the VM *myVm* from the internet as follows:
155155
Non-authoritative answer:
156156
Name: mydemoserver.privatelink.mariadb.database.azure.com
157157
Address: 10.1.3.4
158+
```
158159
159160
3. Test the private link connection for the MariaDB server using any available client. In the example below I have used [MySQL Workbench](https://dev.mysql.com/doc/workbench/en/wb-installing-windows.html) to do the operation.
160161

0 commit comments

Comments
 (0)