Skip to content

Commit 3591041

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram22-0303
2 parents 978bb4f + f6c1246 commit 3591041

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

articles/active-directory/verifiable-credentials/whats-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Applications that use the Azure Active Directory Verifiable Credentials service
5454

5555
| Tenant region | Request API endpoint POST |
5656
|------------|-------------------|
57-
| Europe | https://beta.eu.did.msidentity.com/v1.0/{tenantID}/verifiablecredentials/request |
58-
| Non-EU | https://beta.did.msidentity.com/v1.0/{tenantID}/verifiablecredentials/request |
57+
| Europe | `https://beta.eu.did.msidentity.com/v1.0/{tenantID}/verifiablecredentials/request` |
58+
| Non-EU | `https://beta.did.msidentity.com/v1.0/{tenantID}/verifiablecredentials/request` |
5959

6060
To confirm which endpoint you should use, we recommend checking your Azure AD tenant's region as described above. If the Azure AD tenant is in the EU, you should use the Europe endpoint.
6161

articles/azure-monitor/app/nodejs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-js
1313

1414
To receive, store, and explore your monitoring data, include the SDK in your code, and then set up a corresponding Application Insights resource in Azure. The SDK sends data to that resource for further analysis and exploration.
1515

16-
The Node.js SDK can automatically monitor incoming and outgoing HTTP requests, exceptions, and some system metrics. Beginning in version 0.20, the SDK also can monitor some common [third-party packages](https://github.com/microsoft/node-diagnostic-channel/tree/master/src/diagnostic-channel-publishers#currently-supported-modules), like MongoDB, MySQL, and Redis. All events related to an incoming HTTP request are correlated for faster troubleshooting.
16+
The Node.js client library can automatically monitor incoming and outgoing HTTP requests, exceptions, and some system metrics. Beginning in version 0.20, the client library also can monitor some common [third-party packages](https://github.com/microsoft/node-diagnostic-channel/tree/master/src/diagnostic-channel-publishers#currently-supported-modules), like MongoDB, MySQL, and Redis. All events related to an incoming HTTP request are correlated for faster troubleshooting.
1717

1818
You can use the TelemetryClient API to manually instrument and monitor additional aspects of your app and system. We describe the TelemetryClient API in more detail later in this article.
1919

@@ -36,7 +36,7 @@ Before you begin, make sure that you have an Azure subscription, or [get a new o
3636
1. Sign in to the [Azure portal][portal].
3737
2. [Create an Application Insights resource](create-new-resource.md)
3838

39-
### <a name="sdk"></a> Set up the Node.js SDK
39+
### <a name="sdk"></a> Set up the Node.js client library
4040

4141
Include the SDK in your app, so it can gather data.
4242

@@ -47,7 +47,7 @@ Include the SDK in your app, so it can gather data.
4747

4848
![Copy instrumentation key](./media/nodejs/instrumentation-key-001.png)
4949

50-
2. Add the Node.js SDK library to your app's dependencies via package.json. From the root folder of your app, run:
50+
2. Add the Node.js client library to your app's dependencies via package.json. From the root folder of your app, run:
5151

5252
```bash
5353
npm install applicationinsights --save
@@ -224,7 +224,7 @@ appInsights
224224

225225
For a full description of the TelemetryClient API, see [Application Insights API for custom events and metrics](./api-custom-events-metrics.md).
226226

227-
You can track any request, event, metric, or exception by using the Application Insights Node.js SDK. The following code example demonstrates some of the APIs that you can use:
227+
You can track any request, event, metric, or exception by using the Application Insights client library for Node.js. The following code example demonstrates some of the APIs that you can use:
228228

229229
```javascript
230230
let appInsights = require("applicationinsights");

articles/data-lake-store/data-lake-store-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ No, but Default ACLs can be used to set ACLs for child files and folder newly cr
287287
* [POSIX Access Control Lists on Linux](https://www.linux.com/news/posix-acls-linux)
288288
* [HDFS permission guide](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html)
289289
* [POSIX FAQ](https://www.opengroup.org/austin/papers/posix_faq.html)
290-
* [POSIX 1003.1 2008](https://standards.ieee.org/findstds/standard/1003.1-2008.html)
290+
* [POSIX 1003.1 2008](https://standards.ieee.org/wp-content/uploads/import/documents/interpretations/1003.1-2008_interp.pdf)
291291
* [POSIX 1003.1 2013](https://pubs.opengroup.org/onlinepubs/9699919799.2013edition/)
292292
* [POSIX 1003.1 2016](https://pubs.opengroup.org/onlinepubs/9699919799.2016edition/)
293293
* [POSIX ACL on Ubuntu](https://help.ubuntu.com/community/FilePermissionsACLs)

articles/machine-learning/how-to-secure-workspace-vnet.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Azure Container Registry can be configured to use a private endpoint. Use the fo
207207

208208
[!INCLUDE [cli v2](../../includes/machine-learning-cli-v2.md)]
209209

210-
If you've [installed the Machine Learning extension v2 for Azure CLI](how-to-configure-cli.md), you can use the `az ml workspace show` command to show the workspace information.
210+
If you've [installed the Machine Learning extension v2 for Azure CLI](how-to-configure-cli.md), you can use the `az ml workspace show` command to show the workspace information. The v1 extension does not return this information.
211211

212212
```azurecli-interactive
213213
az ml workspace show -w yourworkspacename -g resourcegroupname --query 'container_registry'
@@ -254,15 +254,10 @@ Azure Container Registry can be configured to use a private endpoint. Use the fo
254254
255255
# [Azure CLI](#tab/cli)
256256
257-
[!INCLUDE [cli v2](../../includes/machine-learning-cli-v2.md)]
258-
259-
If you've [installed the Machine Learning extension v2 for Azure CLI](how-to-configure-cli.md), you can use the `az ml workspace update` command to set a build compute. In the following command, replace `myworkspace` with your workspace name, `myresourcegroup` with the resource group that contains the workspace, and `mycomputecluster` with the compute cluster name:
257+
You can use the `az ml workspace update` command to set a build compute. The command is the same for both the v1 and v2 Azure CLI extensions for machine learning. In the following command, replace `myworkspace` with your workspace name, `myresourcegroup` with the resource group that contains the workspace, and `mycomputecluster` with the compute cluster name:
260258
261259
```azurecli
262-
az ml workspace update \
263-
-n myworkspace \
264-
-g myresourcegroup \
265-
-i mycomputecluster
260+
az ml workspace update --name myworkspace --resource-group myresourcegroup --image-build-compute mycomputecluster
266261
```
267262
268263
# [Python SDK](#tab/python)

articles/marketplace/marketplace-apis-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ The activities below are not sequential. The activity you use is dependent on yo
1919

2020
| <center>Activity | ISV sales activities | Corresponding Marketplace API | Corresponding Marketplace UI |
2121
| --- | --- | --- | --- |
22-
| <center>**1. Product Marketing**<br><img src="media/api-guide/icon-product-marketing.png" alt="The icon for product marketing"> | Create product messaging, positioning, promotion, pricing | Create product messaging, positioning, promotion, pricing<br>[Partner Ingestion API](https://ingestionapi-swagger.azureedge.net)<br>[Azure Apps Onboarding API](azure-app-apis.md)</ul> | Create product messaging, positioning, promotion, pricing<br>Partner Center (PC) → Offer Creation |
22+
| <center>**1. Product Marketing**<br><img src="media/api-guide/icon-product-marketing.png" alt="The icon for product marketing"> | Create product messaging, positioning, promotion, pricing | Create product messaging, positioning, promotion, pricing<br>Partner Ingestion API<br>[Azure Apps Onboarding API](azure-app-apis.md)</ul> | Create product messaging, positioning, promotion, pricing<br>Partner Center (PC) → Offer Creation |
2323
| <center>**2. Demand Generation**<br><img src="media/api-guide/icon-demand-generation.png" alt="The icon for demand generation"> | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC<br>[Lead CRM Connector for D365, SFDC and Marketo](partner-center-portal/commercial-marketplace-get-customer-leads.md)<br>[Co-Sell Connector for SalesForce CRM](/partner-center/connector-salesforce)<br>[Co-Sell Connector for Dynamics 365 CRM](/partner-center/connector-dynamics) | Product Promotion<br>Lead nurturing<br>Eval, trial & PoC<br>Azure Marketplace and AppSource<br>PC Marketplace Insights<br>PC Co-Sell Opportunities |
24-
| <center>**3. Negotiation and Quote Creation**<br><img src="media/api-guide/icon-negotiation-quote-creation.png" alt="The icon for negotiation and quote creation"> | T&Cs<br>Pricing<br>Discount approvals<br>Final quote | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>[CPP API for VM's](cloud-partner-portal-api-overview.md)<br>[Microsoft Graph for AAD API](../active-directory/reports-monitoring/concept-reporting-api.md)<br>[Partner Center '7' API Family](https://apidocs.microsoft.com/services/partnercenter) | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>PC → Plans (public or private) |
24+
| <center>**3. Negotiation and Quote Creation**<br><img src="media/api-guide/icon-negotiation-quote-creation.png" alt="The icon for negotiation and quote creation"> | T&Cs<br>Pricing<br>Discount approvals<br>Final quote | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>[CPP API for VM's](cloud-partner-portal-api-overview.md)<br>[Microsoft Graph for AAD API](../active-directory/reports-monitoring/concept-reporting-api.md)<br>[Partner Center '7' API Family](/partner-center/) | T&Cs<br>Pricing<br>Discount approvals<br>Final quote<br>PC → Plans (public or private) |
2525
| <center>**4. Sale**<br><img src="media/api-guide/icon-sale.png" alt="The icon for sale"> | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing<br>[SaaS fulfillment API v.2](partner-center-portal/pc-saas-fulfillment-apis.md)<br>[Reporting APIs](https://partneranalytics-api.azureedge.net/partneranalytics-api/Programmatic%20Access%20to%20Commercial%20Marketplace%20Analytics%20Data_v1.pdf) | Contract signing<br>Revenue Recognition<br>Invoicing<br>Billing<br>Azure portal / Admin Center<br>PC Marketplace Rewards<br>PC Payouts Reports<br>PC Marketplace Analytics<br>PC Co-Sell Closing |
26-
| <center>**5. Maintenance**<br><img src="media/api-guide/icon-maintenance.png" alt="The icon for maintenance"> | Recurring billing<br>Overages<br>Product Support | Recurring billing<br>Overages<br>Product Support<br>[SaaS/AMAs: Billing APIs](https://partneranalytics-api.azureedge.net/partneranalytics-api/Programmatic%20Access%20to%20Commercial%20Marketplace%20Analytics%20Data_v1.pdf)<br>[SaaS fulfillment API v.2](partner-center-portal/pc-saas-fulfillment-apis.md)<br>[Partner Payouts API](https://apidocs.microsoft.com/services/partnerpayouts) <br>[github](https://github.com/microsoft/Partner-Center-Payout-APIs)<br>[Metered billing API](marketplace-metering-service-apis.md)<br>[(EA Customer) Azure Consumption API](/rest/api/consumption/)<br>[(EA Customer) Azure Charges List API](/rest/api/consumption/charges/list) | Recurring billing<br>Overages<br>Product Support<br>PC Payouts Reports<br>PC Marketplace Analytics |
26+
| <center>**5. Maintenance**<br><img src="media/api-guide/icon-maintenance.png" alt="The icon for maintenance"> | Recurring billing<br>Overages<br>Product Support | Recurring billing<br>Overages<br>Product Support<br>[SaaS/AMAs: Billing APIs](https://partneranalytics-api.azureedge.net/partneranalytics-api/Programmatic%20Access%20to%20Commercial%20Marketplace%20Analytics%20Data_v1.pdf)<br>[SaaS fulfillment API v.2](partner-center-portal/pc-saas-fulfillment-apis.md)<br>Partner Payouts API<br>[github](https://github.com/microsoft/Partner-Center-Payout-APIs)<br>[Metered billing API](marketplace-metering-service-apis.md)<br>[(EA Customer) Azure Consumption API](/rest/api/consumption/)<br>[(EA Customer) Azure Charges List API](/rest/api/consumption/charges/list) | Recurring billing<br>Overages<br>Product Support<br>PC Payouts Reports<br>PC Marketplace Analytics |
2727
| <center>**6. Contract End**<br><img src="media/api-guide/icon-contract-end.png" alt="The icon for contract end"> | Renew or<br>Terminate |Renew or<br>Terminate <br>[SaaS fulfillment API v.2](./partner-center-portal/pc-saas-fulfillment-apis.md)<br>AMA/VM's: auto-renew | Renew or<br>Terminate<br>PC Marketplace Analytics |
2828
|
2929

articles/storage/blobs/data-lake-storage-access-control.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ az ad sp show --id 18218b12-1895-43e9-ad80-6e8fc1ea88ce --query objectId
336336

337337
OID will be displayed.
338338

339-
When you have the correct OID for the service principal, go to the Storage Explorer **Manage Access** page to add the OID and assign appropriate permissions for the OID. Make sure you select **Save**.
339+
When you have the correct OID for the service principal, go to the Storage Explorer **Manage Access** page to add the OID and assign appropriate permissions for the OID. Make sure you select **Save**
340340

341341
### Can I set the ACL of a container?
342342

@@ -349,7 +349,7 @@ The Azure Storage REST API does contain an operation named [Set Container ACL](/
349349
- [POSIX Access Control Lists on Linux](https://www.linux.com/news/posix-acls-linux)
350350
- [HDFS permission guide](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html)
351351
- [POSIX FAQ](https://www.opengroup.org/austin/papers/posix_faq.html)
352-
- [POSIX 1003.1 2008](https://standards.ieee.org/findstds/standard/1003.1-2008.html)
352+
- [POSIX 1003.1 2008](https://standards.ieee.org/wp-content/uploads/import/documents/interpretations/1003.1-2008_interp.pdf)
353353
- [POSIX 1003.1 2013](https://pubs.opengroup.org/onlinepubs/9699919799.2013edition/)
354354
- [POSIX 1003.1 2016](https://pubs.opengroup.org/onlinepubs/9699919799.2016edition/)
355355
- [POSIX ACL on Ubuntu](https://help.ubuntu.com/community/FilePermissionsACLs)

0 commit comments

Comments
 (0)