Skip to content

Commit a7e5267

Browse files
authored
Merge pull request #127440 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 1736091 + 0ec44cd commit a7e5267

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

articles/active-directory/develop/v2-oauth2-on-behalf-of-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The following example shows a success response to a request for an access token
149149
```
150150

151151
> [!NOTE]
152-
> The above access token is a v1.0-formatted token for Microosft Graph. This is because the token format is based on the **resource** being accessed and unrelated to the endpoints used to request it. The Microsoft Graph is setup to accept v1.0 tokens, so Microsoft identity platform produces v1.0 access tokens when a client requests tokens for Microsoft Graph. Other apps may indicate that they want v2.0-format tokens, v1.0-format tokens, or even proprietary or encrypted token formats. Both the v1.0 and v2.0 endpoints can emit either format of token - this way the resource can always get the right format of token regardless of how or where the token was requested by the client.
152+
> The above access token is a v1.0-formatted token for Microsoft Graph. This is because the token format is based on the **resource** being accessed and unrelated to the endpoints used to request it. The Microsoft Graph is setup to accept v1.0 tokens, so Microsoft identity platform produces v1.0 access tokens when a client requests tokens for Microsoft Graph. Other apps may indicate that they want v2.0-format tokens, v1.0-format tokens, or even proprietary or encrypted token formats. Both the v1.0 and v2.0 endpoints can emit either format of token - this way the resource can always get the right format of token regardless of how or where the token was requested by the client.
153153
>
154154
> Only applications should look at access tokens. Clients **must not** inspect them. Inspecting access tokens for other apps in your code will result in your app unexpectedly breaking when that app changes the format of their tokens or starts encrypting them.
155155

articles/azure-monitor/insights/storage-insights-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ To view the utilization and availability of your storage accounts across all of
5050

5151
### Overview workbook
5252

53-
On the **Overview** workbook for the selected subscription, the table displays interactive storage metrics and service availability state for up to 10 storage accounts grouped within the subscription. You can filter the results based on the options you select from the following drop-down lists:
53+
On the **Overview** workbook for the selected subscription, the table displays interactive storage metrics and service availability state for up to 5 storage accounts grouped within the subscription. You can filter the results based on the options you select from the following drop-down lists:
5454

5555
* **Subscriptions** - only subscriptions that have storage accounts are listed.
5656

57-
* **Storage Accounts** - by default, 10 storage accounts are pre-selected. If you select all or multiple storage accounts in the scope selector, up to 200 storage accounts will be returned. For example, if you had a total of 573 storage accounts across three subscriptions that you've selected, only 200 accounts would be displayed.
57+
* **Storage Accounts** - by default, 5 storage accounts are pre-selected. If you select all or multiple storage accounts in the scope selector, up to 200 storage accounts will be returned. For example, if you had a total of 573 storage accounts across three subscriptions that you've selected, only 200 accounts would be displayed.
5858

5959
* **Time Range** - by default, displays the last 4 hours of information based on the corresponding selections made.
6060

articles/azure-monitor/insights/vminsights-ga-release-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ When a Log Analytics workspace is upgraded to the latest version of Azure Monito
3535
Use the following command to upgrade a workspace using PowerShell:
3636

3737
```PowerShell
38-
Set-AzureRmOperationalInsightsIntelligencePack -ResourceGroupName <resource-group-name> -WorkspaceName <workspace-name> -IntelligencePackName "VMInsights" -Enabled $True
38+
Set-AzOperationalInsightsIntelligencePack -ResourceGroupName <resource-group-name> -WorkspaceName <workspace-name> -IntelligencePackName "VMInsights" -Enabled $True
3939
```
4040

4141
## What should I do about the Performance counters in my workspace if I install the VMInsights solution?

articles/azure-monitor/platform/log-analytics-agent.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ For the Linux agent, the proxy server is specified during installation or [after
210210
211211
`[protocol://][user:password@]proxyhost[:port]`
212212
213-
> [!NOTE]
214-
> If your proxy server does not require you to authenticate, the Linux agent still requires providing a pseudo user/password. This can be any username or password.
215-
216213
|Property| Description |
217214
|--------|-------------|
218215
|Protocol | https |

articles/azure-monitor/platform/private-storage.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ subscriptions/{subscriptionId}/resourcesGroups/{resourceGroupName}/providers/Mic
7474
```
7575

7676

77+
## Get linked storage accounts
78+
7779
### Get linked storage accounts for all data source types
7880

7981
#### API request

articles/azure-sql/database/single-database-create-quickstart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.date: 04/19/2020
1616

1717
In this quickstart, you use the Azure portal, a PowerShell script, or an Azure CLI script to create a single database in Azure SQL Database. You then query the database using **Query editor** in the Azure portal.
1818

19-
A [single database](single-database-overview.md) is the quickest and simplest option for Azure SQL Database. You manage a single database within a [server](logical-servers.md), which is inside an [Azure resource group](../../active-directory-b2c/overview.md) in a specified Azure region. In this quickstart, you create a new resource group and server for the new database.
19+
A [single database](single-database-overview.md) is the quickest and simplest option for Azure SQL Database. You manage a single database within a [server](logical-servers.md), which is inside an [Azure resource group](../../azure-resource-manager/management/manage-resource-groups-portal.md) in a specified Azure region. In this quickstart, you create a new resource group and server for the new database.
2020

2121
You can create a single database in the *provisioned* or *serverless* compute tier. A provisioned database is pre-allocated a fixed amount of compute resources, including CPU and memory, and uses one of two [purchasing models](purchasing-models.md). This quickstart creates a provisioned database using the [vCore-based](service-tiers-vcore.md) purchasing model, but you can also choose a [DTU-based](service-tiers-dtu.md) model.
2222

@@ -98,4 +98,4 @@ Remove-AzResourceGroup -Name <your resource group>
9898
Want to optimize and save on your cloud spending?
9999

100100
> [!div class="nextstepaction"]
101-
> [Start analyzing costs with Cost Management](https://docs.microsoft.com/azure/cost-management-billing/costs/quick-acm-cost-analysis?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn)
101+
> [Start analyzing costs with Cost Management](https://docs.microsoft.com/azure/cost-management-billing/costs/quick-acm-cost-analysis?WT.mc_id=costmanagementcontent_docsacmhorizontal_-inproduct-learn)

0 commit comments

Comments
 (0)