Skip to content

Commit 516cccc

Browse files
authored
Merge pull request #112741 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 075cd32 + fd0ca71 commit 516cccc

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
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
@@ -183,7 +183,7 @@ Authorization: Bearer eyJ0eXAiOiJKV1QiLCJub25jZSI6IkFRQUJBQUFBQUFCbmZpRy1tQTZOVG
183183
Depending on the architecture or usage of your application, you may consider different strategies for ensuring that the OBO flow is successful. In all cases, the ultimate goal is to ensure proper consent is given so that the client app can call the middle-tier app, and the middle tier app has permission to call the back-end resource.
184184

185185
> [!NOTE]
186-
> Previously the Microsoft account system (personal accounts) did not support the "Known client application" field, nor could it show combined consent. This has been added and all apps in the Microsoft identity platform can use the known client application approach for gettign consent for OBO calls.
186+
> Previously the Microsoft account system (personal accounts) did not support the "Known client application" field, nor could it show combined consent. This has been added and all apps in the Microsoft identity platform can use the known client application approach for getting consent for OBO calls.
187187
188188
### /.default and combined consent
189189

articles/active-directory/manage-apps/application-proxy-connector-installation-problem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Follow the steps to verify the certificate:
9494
2. Extract [PsExec](https://docs.microsoft.com/sysinternals/downloads/psexec) from the package and run **psexec -i -u "nt authority\network service" cmd.exe** from an elevated command prompt.
9595
3. Run **certmgr.msc** in the newly appeared command prompt
9696
2. In the management console expand the Personal container and click on Certificates
97-
3. Locate the certificate issued by **connectorregistrationca.msappproxy.ne
97+
3. Locate the certificate issued by **connectorregistrationca.msappproxy.net**
9898

9999
**To renew the client certificate:**
100100

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ Can perform common billing related tasks like updating payment information.
640640
| microsoft.directory/organization/basic/update | Update basic properties on organization in Azure Active Directory. |
641641
| microsoft.azure.serviceHealth/allEntities/allTasks | Read and configure Azure Service Health. |
642642
| microsoft.azure.supportTickets/allEntities/allTasks | Create and manage Azure support tickets. |
643-
| microsoft.commerce.billing/allEntities/allTasks | Manage all aspects of Office 365 billing. |
643+
| microsoft.commerce.billing/allEntities/allTasks | Manage all aspects of billing. |
644644
| microsoft.office365.webPortal/allEntities/basic/read | Read basic properties on all resources in microsoft.office365.webPortal. |
645645
| microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |
646646
| microsoft.office365.supportTickets/allEntities/allTasks | Create and manage Office 365 support tickets. |
@@ -750,7 +750,7 @@ Can manage all aspects of Azure AD and Microsoft services that use Azure AD iden
750750
| microsoft.azure.informationProtection/allEntities/allTasks | Manage all aspects of Azure Information Protection. |
751751
| microsoft.azure.serviceHealth/allEntities/allTasks | Read and configure Azure Service Health. |
752752
| microsoft.azure.supportTickets/allEntities/allTasks | Create and manage Azure support tickets. |
753-
| microsoft.commerce.billing/allEntities/allTasks | Manage all aspects of Office 365 billing. |
753+
| microsoft.commerce.billing/allEntities/allTasks | Manage all aspects of billing. |
754754
| microsoft.intune/allEntities/allTasks | Manage all aspects of Intune. |
755755
| microsoft.office365.complianceManager/allEntities/allTasks | Manage all aspects of Office 365 Compliance Manager |
756756
| microsoft.office365.desktopAnalytics/allEntities/allTasks | Manage all aspects of Desktop Analytics. |
@@ -1043,7 +1043,7 @@ Can read everything that a Global Administrator can, but not edit anything.
10431043
10441044
| **Actions** | **Description** |
10451045
| --- | --- |
1046-
| microsoft.commerce.billing/allEntities/read | Read all aspects of Office 365 billing. |
1046+
| microsoft.commerce.billing/allEntities/read | Read all aspects of billing. |
10471047
| microsoft.directory/administrativeUnits/basic/read | Read basic properties on administrativeUnits in Azure Active Directory. |
10481048
| microsoft.directory/administrativeUnits/members/read | Read administrativeUnits.members property in Azure Active Directory. |
10491049
| microsoft.directory/applications/basic/read | Read basic properties on applications in Azure Active Directory. |

articles/aks/quickstart-helm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ appVersion: v1
176176
177177
## Run your Helm chart
178178
179-
Use the `helm create` command to install your application using your Helm chart.
179+
Use the `helm install` command to install your application using your Helm chart.
180180

181181
```console
182182
helm install webfrontend webfrontend/

articles/cosmos-db/cassandra-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: thvankra
1111

1212
## What are some key differences between Apache Cassandra and the Cassandra API?
1313

14-
- Apache Cassandra recommends a 100-MB limit on the size of a partition key. The Cassandra API for Azure Cosmos DB allows up to 10 GB per partition.
14+
- Apache Cassandra recommends a 100-MB limit on the size of a partition key. The Cassandra API for Azure Cosmos DB allows up to 20 GB per partition.
1515
- Apache Cassandra allows you to disable durable commits. You can skip writing to the commit log and go directly to the memtables. This can lead to data loss if the node goes down before memtables are flushed to SSTables on disk. Azure Cosmos DB always does durable commits to help prevent data loss.
1616
- Apache Cassandra can see diminished performance if the workload involves many replacements or deletions. The reason is tombstones that the read workload needs to skip over to fetch the latest data. The Cassandra API won't see diminished read performance when the workload has many replacements or deletions.
1717
- During scenarios of high replacement workloads, compaction needs to run to merge SSTables on disk. (A merge is needed because Apache Cassandra's writes are append only. Multiple updates are stored as individual SSTable entries that need to be periodically merged). This situation can also lead to lowered read performance during compaction. This performance impact doesn't happen in the Cassandra API because the API doesn't implement compaction.

articles/virtual-machines/windows/disks-upload-vhd-to-managed-disk-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Use AzCopy v10 to upload your local VHD file to a managed disk by specifying the
7272
This upload has the same throughput as the equivalent [standard HDD](disks-types.md#standard-hdd). For example, if you have a size that equates to S4, you will have a throughput of up to 60 MiB/s. But, if you have a size that equates to S70, you will have a throughput of up to 500 MiB/s.
7373

7474
```
75-
AzCopy.exe copy "c:\somewhere\mydisk.vhd"$diskSas.AccessSAS --blob-type PageBlob
75+
AzCopy.exe copy "c:\somewhere\mydisk.vhd" $diskSas.AccessSAS --blob-type PageBlob
7676
```
7777

7878
After the upload is complete, and you no longer need to write any more data to the disk, revoke the SAS. Revoking the SAS will change the state of the managed disk and allow you to attach the disk to a VM.

0 commit comments

Comments
 (0)