Skip to content

Commit 897b698

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into redirect
2 parents b7ad233 + 7904835 commit 897b698

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

articles/active-directory/fundamentals/add-custom-domain.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ For more information about subscription roles, see [Azure roles](../../role-base
4343

4444
After you create your directory, you can add your custom domain name.
4545

46+
> [!IMPORTANT]
47+
> When updating domain information, you may be unable to complete the process and encounter a HTTP 500 Internal Server Error message. Under some conditions, this error may be expected. This message may appear if you try to use a protected DNS suffix. Protected DNS suffixes may only be used by Microsoft. If you believe that this operation should have been completed successfully, please contact your Microsoft representative for assistance.
48+
4649
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least a [Domain Name Administrator](../roles/permissions-reference.md#domain-name-administrator).
4750

4851
1. Browse to **Identity** > **Settings** > **Domain names** > **Add custom domain**.

articles/active-directory/privileged-identity-management/pim-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ Creation of **\*AssignmentScheduleRequest** or **\*EligibilityScheduleRequest**
7979
- **\*AssignmentSchedule** and **\*EligibilitySchedule** objects show current assignments and requests for assignments to be created in the future.
8080
- **\*AssignmentScheduleInstance** and **\*EligibilityScheduleInstance** objects show current assignments only.
8181

82-
When an eligible assignment is activated (Create **\*AssignmentScheduleRequest** was called), the **\*EligibilityScheduleInstance** continues to exist, new **\*AssignmentSchedule** and a **\*AssignmentScheduleInstance** objects will be created for that activated duration.
82+
When an eligible assignment is activated (**Create** **\*AssignmentScheduleRequest** was called), the **\*EligibilityScheduleInstance** continues to exist, new **\*AssignmentSchedule** and a **\*AssignmentScheduleInstance** objects will be created for that activated duration.
8383

8484
For more information about assignment and activation APIs, see [PIM API for managing role assignments and eligibilities](/graph/api/resources/privilegedidentitymanagementv3-overview#pim-api-for-managing-role-assignment).
8585

8686

8787

8888
#### PIM Policies (role settings)
8989

90-
To manage the PIM policies, use **roleManagementPolicy** and **roleManagementPolicyAssignment** entities:
90+
To manage the PIM policies, use **\*roleManagementPolicy** and **\*roleManagementPolicyAssignment** entities:
9191
- For PIM for Azure AD roles, PIM for Groups: [unifiedroleManagementPolicy](/graph/api/resources/unifiedrolemanagementpolicy), [unifiedroleManagementPolicyAssignment](/graph/api/resources/unifiedrolemanagementpolicyassignment)
9292
- For PIM for Azure resources: [Role Management Policies](/rest/api/authorization/role-management-policies), [Role Management Policy Assignments](/rest/api/authorization/role-management-policy-assignments)
9393

articles/azure-functions/functions-bindings-storage-queue-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ To handle poison messages manually, check the [dequeueCount](#message-metadata)
514514

515515

516516
## Peek lock
517-
The peek-lock pattern happens automatically for queue triggers. As messages are dequeued, they are marked as invisible and associated with a timeout managed by the Storage service.
517+
The peek-lock pattern happens automatically for queue triggers. As messages are dequeued, they are marked as invisible and associated with a 10-minute timeout managed by the Storage service. This timeout can't be changed.
518518

519519
When the function starts, it starts processing a message under the following conditions.
520520

articles/communication-services/concepts/voice-video-calling/calling-sdk-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The following table represents the set of supported browsers, which are currentl
127127
| Windows | ✔️ || ✔️ | ✔️ ||
128128
| Ubuntu/Linux | ✔️ |||||
129129

130-
- Outgoing Screen Sharing isn't supported on iOS or Android.
130+
- Outgoing Screen Sharing isn't supported on iOS or Android mobile browsers.
131131
- Firefox support is in public preview.
132132
- ACS only supports Android System WebView on Android, iOS WebView(WKWebView) in public preview. Other types of embedded browsers or WebView on other OS platforms aren't officially supported, for example, GeckoView, Chromium Embedded Framework (CEF), Microsoft Edge WebView2.
133133
Running JavaScript Calling SDK on these platforms isn't actively tested, it may or may not work.

articles/cost-management-billing/automate/understand-usage-details-fields.md

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
9595
| ResellerMpnId | MPA | ID for the reseller associated with the subscription. |
9696
| ReservationId¹ | EA, MCA | Unique identifier for the purchased reservation instance. |
9797
| ReservationName | EA, MCA | Name of the purchased reservation instance. |
98-
| ResourceGroup | All | Name of the [resource group](../../azure-resource-manager/management/overview.md) the resource is in. Not all charges come from resources deployed to resource groups. Charges that don't have a resource group will be shown as null or empty, **Others**, or **Not applicable**. |
98+
| ResourceGroup | All | Name of the [resource group](../../azure-resource-manager/management/overview.md) the resource is in. Not all charges come from resources deployed to resource groups. Charges that don't have a resource group are shown as null or empty, **Others**, or **Not applicable**. |
9999
| ResourceId¹ | All | Unique identifier of the [Azure Resource Manager](/rest/api/resources/resources) resource. |
100100
| ResourceLocation¹ | All | Datacenter location where the resource is running. See `Location`. |
101-
| ResourceName | EA, pay-as-you-go | Name of the resource. Not all charges come from deployed resources. Charges that don't have a resource type will be shown as null/empty, **Others** , or **Not applicable**. |
102-
| ResourceType | MCA | Type of resource instance. Not all charges come from deployed resources. Charges that don't have a resource type will be shown as null/empty, **Others** , or **Not applicable**. |
103-
| RoundingAdjustment | EA, MCA | Rounding adjustment represents the quantization that occurs during cost calculation. When the calculated costs are converted to the invoiced total, small rounding errors can occur. The rounding errors are represented as `rounding adjustment` to ensure that the costs shown in Cost Management align to the invoice. |
101+
| ResourceName | EA, pay-as-you-go | Name of the resource. Not all charges come from deployed resources. Charges that don't have a resource type are shown as null/empty, **Others** , or **Not applicable**. |
102+
| ResourceType | MCA | Type of resource instance. Not all charges come from deployed resources. Charges that don't have a resource type are shown as null/empty, **Others** , or **Not applicable**. |
103+
| RoundingAdjustment | EA, MCA | Rounding adjustment represents the quantization that occurs during cost calculation. When the calculated costs are converted to the invoiced total, small rounding errors can occur. The rounding errors are represented as `rounding adjustment` to ensure that the costs shown in Cost Management align to the invoice. For more information, see [Rounding adjustment details](#rounding-adjustment-details). |
104104
| ServiceFamily | MCA | Service family that the service belongs to. |
105105
| ServiceInfo¹ | All | Service-specific metadata. |
106106
| ServiceInfo2 | All | Legacy field with optional service-specific metadata. |
@@ -109,17 +109,48 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
109109
| SubscriptionId¹ | All | Unique identifier for the Azure subscription. |
110110
| SubscriptionName | All | Name of the Azure subscription. |
111111
| Tags¹ | All | Tags assigned to the resource. Doesn't include resource group tags. Can be used to group or distribute costs for internal chargeback. For more information, see [Organize your Azure resources with tags](https://azure.microsoft.com/updates/organize-your-azure-resources-with-tags/). |
112-
| Term | All | Displays the term for the validity of the offer. For example: In case of reserved instances, it displays 12 months as the Term. For one-time purchases or recurring purchases, Term is one month (SaaS, Marketplace Support). Not applicable for Azure consumption. |
112+
| Term | All | Displays the term for the validity of the offer. For example: For reserved instances, it displays 12 months as the Term. For one-time purchases or recurring purchases, Term is one month (SaaS, Marketplace Support). Not applicable for Azure consumption. |
113113
| UnitOfMeasure | All | The unit of measure for billing for the service. For example, compute services are billed per hour. |
114114
| UnitPrice | EA, pay-as-you-go | The price per unit for the charge. |
115115

116-
117116
¹ Fields used to build a unique ID for a single cost record. Every record in your cost details file should be considered unique.
118117

119-
The cost details file itself doesn’t uniquely identify individual records with an ID. Instead, you can use fields in the file flagged with ¹ to create a unique ID yourself.
118+
The cost details file itself doesn’t uniquely identify individual records with an ID. Instead, you can use fields in the file flagged with ¹ to create a unique ID yourself.
120119

121120
Some fields might differ in casing and spacing between account types. Older versions of pay-as-you-go cost details files have separate sections for the statement and daily cost.
122121

122+
### Rounding adjustment details
123+
124+
Rounding adjustment isn't available in the cost details file during an open month. The adjustment is visible when the month closes and the invoice gets generated.
125+
126+
The rounding adjustment record is available in the Cost Details file at the Billing Profile scope for an MCA or at the Enrollment scope for EA. Because it's an aggregated value available at the invoice level, there's no lower-scope-level information available for the record. The following fields are the only valid ones for a record on rounding adjustment:
127+
128+
- `BillingAccountId`
129+
- `BillingAccountName`
130+
- `BillingPeriodStartDate`
131+
- `BillingPeriodEndDate`
132+
- `BillingProfileId`
133+
- `BillingProfileName`
134+
135+
`MeterCategory`, `MeterSubCategory`, and `ChargeType` fields have the value as `RoundingAdjustment`.
136+
137+
Here's an example of how rounding adjustment works in practice:
138+
139+
Suppose you have two resources in your subscription, A and B. Resource A costs $0.1234 per hour and resource B costs $0.5678 per hour. You use both resources for 10 hours in a day, so the total cost for each resource is:
140+
141+
- Resource A: $0.1234 x 10 = $1.234
142+
- Resource B: $0.5678 x 10 = $5.678
143+
144+
The total cost for the day is $1.234 + $5.678 = $6.912.
145+
146+
However, when the invoice is generated, the costs are rounded to two decimal places, so the invoice shows:
147+
148+
- Resource A: $1.23
149+
- Resource B: $5.68
150+
- Total: $6.91
151+
152+
The difference between the invoice total and the actual total is $0.002, which is the rounding adjustment. To make sure that Cost Management costs match the invoice, the amount is shown in the cost details file.
153+
123154
### List of terms from older APIs
124155

125156
The following table maps terms used in older APIs to the new terms. Refer to the above table for those descriptions.

articles/key-vault/secrets/quick-create-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: mbaldwin
1313
#Customer intent: As a security admin who is new to Azure, I want to use Key Vault to securely store keys and passwords in Azure.
1414
---
1515

16-
# Quickstart: Set and retrieve a secret from Azure Key Vault using Bicep
16+
# Quickstart: Create an Azure key vault and a secret using Bicep
1717

1818
[Azure Key Vault](../general/overview.md) is a cloud service that provides a secure store for secrets, such as keys, passwords, certificates, and other secrets. This quickstart focuses on the process of deploying a Bicep file to create a key vault and a secret.
1919

0 commit comments

Comments
 (0)