Skip to content

Commit 767d128

Browse files
Merge pull request #311686 from JKirsch1/foundry-rebrand-batch-8
Foundry branding
2 parents 952b825 + 3525693 commit 767d128

30 files changed

Lines changed: 41 additions & 39 deletions

articles/azure-web-pubsub/quickstart-serverless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ Use the following commands to create these items.
793793
794794
[!INCLUDE [Connection string security comment](includes/web-pubsub-connection-string-security-comment.md)]
795795
796-
First, find your Web PubSub resource from **Azure Portal** and copy out the connection string under **Keys**. Then, navigate to Function App settings in **Azure Portal** -> **Settings** -> **Environment variables**. And add a new item under **App settings**, with name equals `WebPubSubConnectionString` and value is your Web PubSub resource connection string.
796+
First, find your Web PubSub resource from **Azure portal** and copy out the connection string under **Keys**. Then, navigate to Function App settings in **Azure portal** -> **Settings** -> **Environment variables**. And add a new item under **App settings**, with name equals `WebPubSubConnectionString` and value is your Web PubSub resource connection string.
797797
798798
## Configure the Web PubSub service `Event Handler`
799799

articles/azure-web-pubsub/reference-server-sdk-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ WebPubSubServiceClient webPubSubServiceClient = new WebPubSubServiceClientBuilde
7575
```java
7676
WebPubSubServiceClient webPubSubServiceClient = new WebPubSubServiceClientBuilder()
7777
.credential(new AzureKeyCredential("{access-key}"))
78-
.endpoint("<Insert endpoint from Azure Portal>")
78+
.endpoint("<Insert endpoint from Azure portal>")
7979
.hub("chat")
8080
.buildClient();
8181
```

articles/azure-web-pubsub/tutorial-serverless-notification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ Use the following commands to create these items.
735735
```
736736
737737
> [!NOTE]
738-
> Here we are deploying local settings `local.settings.json` together with command parameter `--publish-local-settings`. If you're using Microsoft Azure Storage Emulator, you can type `no` to skip overwriting this value on Azure following the prompt message: `App setting AzureWebJobsStorage is different between azure and local.settings.json, Would you like to overwrite value in azure? [yes/no/show]`. Besides, you can update Function App settings in **Azure Portal** -> **Settings** -> **Configuration**.
738+
> Here we are deploying local settings `local.settings.json` together with command parameter `--publish-local-settings`. If you're using Microsoft Azure Storage Emulator, you can type `no` to skip overwriting this value on Azure following the prompt message: `App setting AzureWebJobsStorage is different between azure and local.settings.json, Would you like to overwrite value in azure? [yes/no/show]`. Besides, you can update Function App settings in **Azure portal** -> **Settings** -> **Configuration**.
739739

740740
1. Now you can check your site from Azure Function App by navigating to URL: `https://<FUNCIONAPP_NAME>.azurewebsites.net/api/index`.
741741

articles/cost-management-billing/manage/manage-billing-across-tenants.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ Choosing to assign roles to users from associated billing tenants might be the r
111111
|Security | The users that you invite to share your billing account follow their tenant's security policies. | The users that you invite to share your billing account follow your tenant's security policies. |
112112
|Access | The users get access to your billing account in their own tenant and can manage billing and make purchases without switching tenants. | External guest identities are created for users in your tenant and these identities get access to your billing account. Users would have to switch tenant to manage billing and make purchases. |
113113

114-
## Understanding Guest Users in Azure Portal
114+
## Understanding Guest Users in Azure portal
115115

116116
A guest user (also known as guested user or B2B user) is an external user who has been invited to access resources within an Azure Active Directory (Azure AD) tenant. Typically, this user has a primary identity in another Azure AD tenant or identity provider and receives access via Azure AD B2B (business-to-business) collaboration features. Once invited, the guest user appears in the inviting organization’s directory and can be assigned roles and permissions just like any other user.
117117

118-
### Accessing the Azure Portal
118+
### Accessing the Azure portal
119119

120-
The guest user must sign in to the [Azure Portal](https://portal.azure.com/) using their own organization’s credentials. Upon successful authentication, they should select the host directory (the client organization) from the top-right user menu in the Azure Portal if they are members of multiple tenants.
120+
The guest user must sign in to the [Azure portal](https://portal.azure.com/) using their own organization’s credentials. Upon successful authentication, they should select the host directory (the client organization) from the top-right user menu in the Azure portal if they are members of multiple tenants.
121121

122122
### Navigation and User Interface
123123

@@ -129,7 +129,7 @@ Once inside the client’s directory, the guest user will see the resources and
129129
## Troubleshooting Common Issues for Guest Users
130130

131131
- Access Denied Errors: Ensure correct roles are assigned and the guest has accepted the invitation.
132-
- Directory Not Found: Instruct the user to switch directories in the Azure Portal.
132+
- Directory Not Found: Instruct the user to switch directories in the Azure portal.
133133
- Resource Visibility: Confirm that the user’s roles map to the correct billing profiles or invoice sections.
134134

135135
## Move Microsoft 365 subscriptions to a billing tenant

articles/cost-management-billing/microsoft-customer-agreement/manage-tenants.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ There are three ways users with billing owner access can assign roles to users t
6767
- Assign billing roles to external users (outside of your primary tenant) if they are part of an associated tenant
6868
- If tenants are not associated, [create guest users in primary tenant and assign roles](#add-guest-users-to-your-microsoft-customer-agreement-tenant).
6969

70-
## Understanding Guest Users in Azure Portal
70+
## Understanding Guest Users in Azure portal
7171

7272
A guest user (also known as guested user or B2B user) is an external user who has been invited to access resources within an Azure Active Directory (Azure AD) tenant. Typically, this user has a primary identity in another Azure AD tenant or identity provider and receives access via Azure AD B2B (business-to-business) collaboration features. Once invited, the guest user appears in the inviting organization’s directory and can be assigned roles and permissions just like any other user.
7373

74-
### Accessing the Azure Portal
74+
### Accessing the Azure portal
7575

7676
The guest user must sign in to the [Azure portal](https://portal.azure.com/) using their own organization’s credentials. Upon successful authentication, they should select the host directory (the client organization) from the top-right user menu in the Azure portal if they are members of multiple tenants.
7777

@@ -117,7 +117,7 @@ Authorization to invite guest users is controlled by your Microsoft Entra settin
117117
## Troubleshooting Common Issues for Guest Users
118118

119119
- Access Denied Errors: Ensure correct roles are assigned and the guest has accepted the invitation.
120-
- Directory Not Found: Instruct the user to switch directories in the Azure Portal.
120+
- Directory Not Found: Instruct the user to switch directories in the Azure portal.
121121
- Resource Visibility: Confirm that the user’s roles map to the correct billing profiles or invoice sections.
122122

123123
## Manage multiple Microsoft cloud services under a Microsoft Entra tenant

articles/cost-management-billing/reservations/agent-pre-purchase.md

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

1515
Save on select services across Microsoft Foundry, Microsoft Copilot Studio*, Microsoft Fabric, and GitHub costs when you buy a prepurchase plan. Prepurchase plans are commit units (CUs) bought at discounted tiers in your purchasing currency for a specific product. The more you buy, the greater the discount. Purchased CUs pay down qualifying costs in US dollars (USD). So, for example if Microsoft Copilot Studio or Microsoft Foundry generates a retail cost of $100 based on Copilot Credit and Microsoft Foundry usage, then 100 Agent CUs (ACUs) are consumed.
1616

17-
Your Microsoft Agent prepurchase plan automatically uses your ACUs to pay for eligible Copilot and AI Foundry usage during its one-year term or until Agent CUs run out. Your prepurchase plan Agent CUs start paying for your Copilot Credit and Microsoft Foundry usage without having to redeploy or reassign the plan. By default, plans are configured to renew at the end of the one-year term.
17+
Your Microsoft Agent prepurchase plan automatically uses your ACUs to pay for eligible Copilot and Microsoft Foundry usage during its one-year term or until Agent CUs run out. Your prepurchase plan Agent CUs start paying for your Copilot Credit and Microsoft Foundry usage without having to redeploy or reassign the plan. By default, plans are configured to renew at the end of the one-year term.
1818

1919
*Covers Copilot Credits-enabled agentic services: Microsoft Copilot Studio, Dynamics 365 first-party agents, and Copilot. Microsoft reserves the right to update Copilot Credit-eligible products.
2020

@@ -24,7 +24,6 @@ Your Microsoft Agent prepurchase plan automatically uses your ACUs to pay for el
2424
:::image type="content" source="./media/agentprepurchase/services-covered-screenshot-v2.jpg" alt-text="Screenshot showing services covered by Microsoft Agent prepurchase plan." lightbox="./media/agentprepurchase/services-covered-screenshot-v2.jpg":::
2525

2626

27-
2827
## Prerequisites
2928

3029
To buy a prepurchase plan, you must have one of the following Azure subscriptions and roles:
@@ -92,6 +91,7 @@ When you have multiple AI-related purchasing options, understanding how benefits
9291
### Understanding benefit overlap
9392

9493
**What is overlap?** Overlap occurs when multiple benefits can cover the same usage. For example:
94+
9595
- Copilot credits are eligible for both Copilot Credit prepurchase plan and Microsoft Agent prepurchase plan
9696
- Microsoft Foundry PTU workloads are eligible for both Microsoft Foundry PTU reservations and Microsoft Agent prepurchase plan
9797

@@ -135,6 +135,7 @@ These scenarios show how benefits work together in different purchasing combinat
135135
- Microsoft Agent prepurchase plan: 20,000 ACUs
136136

137137
**How benefits apply:**
138+
138139
1. Copilot workloads consume Copilot Credit prepurchase plan first (up to 5,000 CCCUs)
139140
2. Additional Copilot usage draws from Microsoft Agent prepurchase plan
140141
3. Microsoft Foundry usage draws from Microsoft Agent prepurchase plan
@@ -146,19 +147,20 @@ These scenarios show how benefits work together in different purchasing combinat
146147
- Microsoft Agent prepurchase plan: 25,000 CUs
147148

148149
**How benefits apply:**
149-
1. Foundry PTU reservation covers first 15 PTUs
150+
1. Microsoft Foundry PTU reservation covers first 15 PTUs
150151
2. Overflow PTU usage draws from Agent prepurchase plan
151152
3. All Copilot usage draws from remaining Agent prepurchase plan
152153

153154
#### Scenario 4: Complete coverage (all three benefits)
154155

155156
**What you have:**
157+
156158
- Microsoft Foundry PTU reservation: 10 PTUs
157159
- Copilot Credit prepurchase plan: 3,000 CUs
158160
- Microsoft Agent prepurchase plan: 15,000 CUs
159161

160162
**How benefits apply:**
161-
1. Foundry reservation covers PTU usage (up to 10 PTUs)
163+
1. Microsoft Foundry reservation covers PTU usage (up to 10 PTUs)
162164
2. Copilot Credit prepurchase plan covers Copilot usage (up to 3,000 CUs)
163165
3. Agent prepurchase plan covers overflow from both platforms
164166

articles/cost-management-billing/understand/review-partner-agreement-bill.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In the billing account for a Microsoft Partner Agreement, an invoice is generate
1717

1818
For more information, see [how to download invoices from the Azure portal](download-azure-invoice.md).
1919

20-
This tutorial applies only to Azure partners with an Microsoft Partner Agreement.
20+
This tutorial applies only to Azure partners with a Microsoft Partner Agreement.
2121

2222
In this tutorial, you learn how to:
2323

articles/digital-twins/concepts-data-ingress-egress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Once the data has been historized, you can query this data in Azure Data Explore
5252

5353
You can also use data history in combination with [Azure Synapse Analytics](../synapse-analytics/overview-what-is.md) to aggregate data from disparate sources. This can be useful in many scenarios. Here are two examples:
5454
* Combine information technology (IT) data from ERP or CRM systems (like Dynamics 365, SAP, or Salesforce) with operational technology (OT) data from IoT devices and production management systems. For an example that illustrates how a company might combine this data, see the following blog post: [Integrating IT and OT Data with Azure Digital Twins, Azure Data Explorer, and Azure Synapse](https://techcommunity.microsoft.com/t5/internet-of-things-blog/integrating-it-and-ot-data-with-azure-digital-twins-azure-data/ba-p/3401981).
55-
* Integrate with the Azure AI and Azure AI services [Multivariate Anomaly Detector](/azure/ai-services/anomaly-detector/overview), to quickly connect your Azure Digital Twins data with a downstream AI/machine learning solution that specializes in anomaly detection. The [Azure Digital Twins Multivariate Anomaly Detection Toolkit](/samples/azure-samples/digital-twins-mvad-integration/adt-mvad-integration/) is a sample project that provides a workflow for training multiple Multivariate Anomaly Detector models for several scenario analyses, based on historical digital twin data. It then leverages the trained models to detect abnormal operations and anomalies in modeled Azure Digital Twins environments, in near real-time.
55+
* Integrate with the Azure AI and Foundry Tools [Multivariate Anomaly Detector](/azure/ai-services/anomaly-detector/overview), to quickly connect your Azure Digital Twins data with a downstream AI/machine learning solution that specializes in anomaly detection. The [Azure Digital Twins Multivariate Anomaly Detection Toolkit](/samples/azure-samples/digital-twins-mvad-integration/adt-mvad-integration/) is a sample project that provides a workflow for training multiple Multivariate Anomaly Detector models for several scenario analyses, based on historical digital twin data. It then leverages the trained models to detect abnormal operations and anomalies in modeled Azure Digital Twins environments, in near real-time.
5656

5757
### Security and delivery details
5858

articles/digital-twins/concepts-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ If a user attempts to perform an action not allowed by their role, they may rece
8484

8585
## Managed identity for accessing other resources
8686

87-
Setting up an [Microsoft Entra ID](../active-directory/fundamentals/active-directory-whatis.md) *managed identity* for an Azure Digital Twins instance can allow the instance to easily access other Microsoft Entra protected resources, such as [Azure Key Vault](/azure/key-vault/general/overview). The identity is managed by the Azure platform, and doesn't require you to provision or rotate any secrets. For more about managed identities in Microsoft Entra ID, see [Managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md).
87+
Setting up a [Microsoft Entra ID](../active-directory/fundamentals/active-directory-whatis.md) *managed identity* for an Azure Digital Twins instance can allow the instance to easily access other Microsoft Entra protected resources, such as [Azure Key Vault](/azure/key-vault/general/overview). The identity is managed by the Azure platform, and doesn't require you to provision or rotate any secrets. For more about managed identities in Microsoft Entra ID, see [Managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md).
8888

8989
Azure Digital Twins supports both types of managed identities, *system-assigned* and *user-assigned*.
9090

articles/digital-twins/how-to-create-app-registration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: sfi-image-nochange
1212

1313
# Create an app registration to use with Azure Digital Twins
1414

15-
This article describes how to create an [Microsoft Entra ID](../active-directory/fundamentals/active-directory-whatis.md) *app registration* that can access Azure Digital Twins. This article includes steps for the [Azure portal](https://portal.azure.com) and the [Azure CLI](/cli/azure/what-is-azure-cli).
15+
This article describes how to create a [Microsoft Entra ID](../active-directory/fundamentals/active-directory-whatis.md) *app registration* that can access Azure Digital Twins. This article includes steps for the [Azure portal](https://portal.azure.com) and the [Azure CLI](/cli/azure/what-is-azure-cli).
1616

1717
When working with Azure Digital Twins, it's common to interact with your instance through client applications. Those applications need to authenticate with Azure Digital Twins, and some of the [authentication mechanisms](how-to-authenticate-client.md) that apps can use involve an app registration.
1818

0 commit comments

Comments
 (0)