Skip to content

Commit 58464f4

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akv-managedid
2 parents e8b7bdd + e3cd443 commit 58464f4

21 files changed

+321
-181
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@
233233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
234234
"branch": "master"
235235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
236241
{
237242
"path_to_root": "iot-samples-c",
238243
"url": "https://github.com/Azure/azure-iot-sdk-c",

articles/cognitive-services/LUIS/luis-concept-data-alteration.md

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Data alteration - LUIS
33
description: Learn how data can be changed before predictions in Language Understanding (LUIS)
44
ms.topic: conceptual
5-
ms.date: 05/05/2020
5+
ms.date: 05/06/2020
66
---
77

88
# Alter utterance data before or during prediction
@@ -70,18 +70,15 @@ The Bing spell check API used in LUIS does not support a list of words to ignore
7070
## Change time zone of prebuilt datetimeV2 entity
7171
When a LUIS app uses the prebuilt [datetimeV2](luis-reference-prebuilt-datetimev2.md) entity, a datetime value can be returned in the prediction response. The timezone of the request is used to determine the correct datetime to return. If the request is coming from a bot or another centralized application before getting to LUIS, correct the timezone LUIS uses.
7272

73-
### Endpoint querystring parameter
74-
The timezone is corrected by adding the user's timezone to the endpoint using the appropriate parameter based on the API version. The value of the parameter should be the positive or negative number, in minutes, to alter the time.
73+
### V3 prediction API to alter timezone
7574

76-
|API version|Querystring parameter|
77-
|--|--|
78-
|v2|`timezoneOffset`|
79-
|v3|`datetimeReference`|
75+
In V3, the `datetimeReference` determines the timezone offset. Learn more about [V3 predictions](luis-migration-api-v3.md#v3-post-body).
8076

81-
### Daylight savings example
82-
If you need the returned prebuilt datetimeV2 to adjust for daylight savings time, you should use the querystring parameter with a +/- value in minutes for the [endpoint](https://go.microsoft.com/fwlink/?linkid=2092356) query.
77+
### V2 prediction API to alter timezone
78+
The timezone is corrected by adding the user's timezone to the endpoint using the `timezoneOffset` parameter based on the API version. The value of the parameter should be the positive or negative number, in minutes, to alter the time.
8379

84-
#### [V2 prediction endpoint request](#tab/V2)
80+
#### V2 prediction daylight savings example
81+
If you need the returned prebuilt datetimeV2 to adjust for daylight savings time, you should use the querystring parameter with a +/- value in minutes for the [endpoint](https://go.microsoft.com/fwlink/?linkid=2092356) query.
8582

8683
Add 60 minutes:
8784

@@ -91,21 +88,7 @@ Remove 60 minutes:
9188

9289
`https://{region}.api.cognitive.microsoft.com/luis/v2.0/apps/{appId}?q=Turn the lights on?timezoneOffset=-60&verbose={boolean}&spellCheck={boolean}&staging={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
9390

94-
#### [V3 prediction endpoint request](#tab/V3)
95-
96-
Add 60 minutes:
97-
98-
`https://{region}.api.cognitive.microsoft.com/luis/v3.0-preview/apps/{appId}/slots/production/predict?query=Turn the lights on?datetimeReference=60&spellCheck={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
99-
100-
Remove 60 minutes:
101-
102-
`https://{region}.api.cognitive.microsoft.com/luis/v3.0-preview/apps/{appId}/slots/production/predict?query=Turn the lights on?datetimeReference=-60&spellCheck={boolean}&bing-spell-check-subscription-key={string}&log={boolean}`
103-
104-
Learn more about the [V3 prediction endpoint](luis-migration-api-v3.md).
105-
106-
* * *
107-
108-
## C# code determines correct value of parameter
91+
#### V2 prediction C# code determines correct value of parameter
10992

11093
The following C# code uses the [TimeZoneInfo](https://docs.microsoft.com/dotnet/api/system.timezoneinfo) class's [FindSystemTimeZoneById](https://docs.microsoft.com/dotnet/api/system.timezoneinfo.findsystemtimezonebyid#examples) method to determine the correct offset value based on system time:
11194

articles/iot-central/core/concepts-get-connected.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ To bulk connect devices using X.509 certificates, first register the devices in
8989

9090
Generate X.509 leaf certificates for your devices using the uploaded root or intermediate certificate. Use the **Device ID** as the `CNAME` value in the leaf certificates. Your device code needs the **ID scope** value for your application, the **device ID**, and the corresponding device certificate.
9191

92+
#### Sample device code
93+
94+
The following sample from the [Azure IoT Node.JS SDK](https://github.com/Azure/azure-iot-sdk-node/blob/master/provisioning/device/samples/register_x509.js) shows how a Node.js device client uses an X.509 leaf certificate and DPS to register with an IoT Central application:
95+
96+
:::code language="nodejs" source="~/azure-iot-sdk-node/provisioning/device/samples/register_x509.js":::
97+
98+
For an equivalent C sample, see [prov_dev_client_sample.c](https://github.com/Azure/azure-iot-sdk-c/blob/master/provisioning_client/samples/prov_dev_client_sample/prov_dev_client_sample.c) in the [Azure IoT C Provisioning Device Client SDK](https://github.com/Azure/azure-iot-sdk-c/blob/master/provisioning_client/devdoc/using_provisioning_client.md).
99+
92100
### For testing purposes only
93101

94102
For testing only, you can use the following utilities to generate root, intermediate, and device certificates:
@@ -101,11 +109,6 @@ For testing only, you can use the following utilities to generate root, intermed
101109
- Use the verification code from the IoT Central application to generate the verification certificate.
102110
- Create leaf certificates for your devices using your device IDs as a parameter to the tool.
103111

104-
### Further reference
105-
106-
- [Sample implementation for RaspberryPi](https://aka.ms/iotcentral-docs-Raspi-releases)
107-
- [Sample device client in C](https://github.com/Azure/azure-iot-sdk-c/blob/master/provisioning_client/devdoc/using_provisioning_client.md)
108-
109112
## Connect without registering devices
110113

111114
The previously described scenarios all require you to register devices in your application before they connect. IoT Central also enables OEMs to mass manufacture devices that can connect without first being registered. An OEM generates suitable device credentials, and configures the devices in the factory. When a customer turns on a device for the first time, it connects to DPS, which then automatically connects the device to the correct IoT Central application. An IoT Central operator must approve the device before it starts sending data to the application.

articles/load-balancer/concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Availability Zones | Standard load balancer supports additional abilities in reg
6767

6868
- Load balancer provides load balancing and port forwarding for specific TCP or UDP protocols. Load-balancing rules and inbound NAT rules support TCP and UDP, but not other IP protocols including ICMP.
6969

70-
- Internal load balancers don't translate outbound originated connections to the frontend of an internal load balancer because both are in private IP address space. Outbound flow from a backend VM to a frontend of an internal load balancer will fail. The failure occurs when the flow is mapped backed to itself. The two legs of the flow don't match and the flow will fail.
70+
- Outbound flow from a backend VM to a frontend of an internal Load Balancer will fail.
7171

7272
- Forwarding IP fragments isn't supported on load-balancing rules. IP fragmentation of UDP and TCP packets isn't supported on load-balancing rules. HA ports load-balancing rules can be used to forward existing IP fragments. For more information, see [High availability ports overview](load-balancer-ha-ports-overview.md).
7373

articles/load-balancer/upgrade-basicInternal-standard.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ An Azure PowerShell script is available that does the following:
2626
### Caveats\Limitations
2727

2828
* Script only supports Internal Load Balancer upgrade where no outbound connection is required. If you required [outbound connection](https://docs.microsoft.com/azure/load-balancer/load-balancer-outbound-connections) for some of your VMs, please refer to this [page](upgrade-InternalBasic-To-PublicStandard.md) for instructions.
29+
* The Basic Load Balancer needs to be in the same resource group as the backend VMs and NICs.
2930
* If the Standard load balancer is created in a different region, you won’t be able to associate the VMs existing in the old region to the newly created Standard Load Balancer. To work around this limitation, make sure to create a new VM in the new region.
3031
* If your Load Balancer does not have any frontend IP configuration or backend pool, you are likely to hit an error running the script. Make sure they are not empty.
3132

@@ -42,7 +43,7 @@ An Azure PowerShell script is available that does the following:
4243

4344
## Download the script
4445

45-
Download the migration script from the [PowerShell Gallery](https://www.powershellgallery.com/packages/AzureILBUpgrade/2.0).
46+
Download the migration script from the [PowerShell Gallery](https://www.powershellgallery.com/packages/AzureILBUpgrade/3.0).
4647
## Use the script
4748

4849
There are two options for you depending on your local PowerShell environment setup and preferences:

articles/machine-learning/concept-designer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ A module may have a set of parameters that you can use to configure the module's
7878

7979
![Module properties](./media/concept-designer/properties.png)
8080

81-
For some help navigating through the library of machine learning algorithms available, see [Algorithm & module reference overview](algorithm-module-reference/module-reference.md)
81+
For some help navigating through the library of machine learning algorithms available, see [Algorithm & module reference overview](algorithm-module-reference/module-reference.md). For help choosing an algorithm, see the [Azure Machine Learning Algorithm Cheat Sheet](algorithm-cheat-sheet.md).
8282

8383
## <a name="compute"></a> Compute resources
8484

@@ -90,7 +90,7 @@ Use compute resources from your workspace to run your pipeline and host your dep
9090
| Azure Machine Learning compute instance || |
9191
| Azure Kubernetes Service | ||
9292

93-
Compute targets are attached to your [Azure Machine Learning workspace](concept-workspace.md). You manage your compute targets in your workspace in [Azure Machine Learning Studio (classic)](https://ml.azure.com).
93+
Compute targets are attached to your [Azure Machine Learning workspace](concept-workspace.md). You manage your compute targets in your workspace in the [Azure Machine Learning studio](https://ml.azure.com).
9494

9595
## Deploy
9696

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure Marketplace and AppSource preferred solutions
3-
description: Overview of preferred solutions within the Marketplace and how they are selected
2+
title: Azure Marketplace and AppSource preferred solutions - Microsoft commercial marketplace
3+
description: Preferred solutions within the Marketplace and how they are selected
44
author: dsindona
55
ms.service: marketplace
66
ms.subservice: partnercenter-marketplace-publisher
@@ -9,6 +9,6 @@ ms.date: 06/27/2018
99
ms.author: dsindona
1010
---
1111

12-
# Preferred Solutions in Azure Marketplace and AppSource
12+
# Preferred solutions in Microsoft AppSource and Azure Marketplace
1313

1414
A Microsoft preferred solution is a cloud application selected for its quality, performance, and ability to address customer needs in a certain industry vertical or solution area. A team of Microsoft experts validates solutions from partners with specific proven competencies and capabilities. These solutions are featured in our cloud marketplace storefronts, Azure Marketplace, and AppSource, as well as in the Azure portal. Preferred solutions on AppSource can be discovered by industry verticals. Preferred solutions on Azure Marketplace and the Azure portal can be discovered across horizontal solution categories.

articles/marketplace/private-offers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Private offers | Azure Marketplace
3-
description: Private offers in the Azure Marketplace for app and service publishers.
2+
title: Private offers in Microsoft commercial marketplace
3+
description: Private offers in the Microsoft commercial marketplace for app and service publishers.
44
author: qianw211
55
ms.service: marketplace
66
ms.subservice: partnercenter-marketplace-publisher
@@ -9,9 +9,9 @@ ms.date: 04/19/2020
99
ms.author: dsindona
1010
---
1111

12-
# Private offers
12+
# Private offers in the Microsoft commercial marketplace
1313

14-
Private offers on [Microsoft Azure Marketplace](https://azuremarketplace.microsoft.com/) enable publishers to create SKUs that are only visible to targeted customers.
14+
Private offers in [Microsoft Azure Marketplace](https://azuremarketplace.microsoft.com/) enable publishers to create plans that are only visible to targeted customers. In this article, you'll learn about the options and benefits of private offers.
1515

1616
## Unlock enterprise deals with private offers
1717

articles/marketplace/publisher-guide-by-offer-type.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Microsoft commercial marketplace publishing guide by offer type
3-
description: This article describes the offer types available in the Microsoft commercial marketplace.
2+
title: Publishing guide by offer type - Microsoft commercial marketplace
3+
description: This article describes the offer types that are available in the Microsoft commercial marketplace.
44
author: dsindona
55
ms.service: marketplace
66
ms.subservice: partnercenter-marketplace-publisher
@@ -11,13 +11,11 @@ ms.author: dsindona
1111

1212
# Publishing guide by offer type
1313

14-
Once you [decide on a publishing option](https://docs.microsoft.com/azure/marketplace/determine-your-listing-type), you are ready to select the offer type that will be used to present your offer.
14+
This article describes the offer types that are available in the commercial marketplace. The *offer type* defines the offer structure, which includes the metadata, artifacts, and other content used to present the offer in the marketplace.
1515

16-
The *offer type* defines the offer structure, which includes the metadata, artifacts, and other content used to present the offer in the marketplace.
16+
Before you can create an offer, and after you [decide on a publishing option](https://docs.microsoft.com/azure/marketplace/determine-your-listing-type), you must choose an offer type that will be used to present your offer. The offer type will correspond to the type of solution, app, or service offer that you wish to publish, as well as its alignment to Microsoft products and services.
1717

18-
Before you can create an offer, you must choose an offer type. The offer type will correspond to the type of solution, app, or service offer that you wish to publish, as well as its alignment to Microsoft products and services.
19-
20-
A single offer type can be configured differently to enable different publishing options, calls-to-action, provisioning, or pricing. The publishing option and configuration of the offer type also align to the offer eligibility and technical requirements.
18+
A single offer type can be configured in different ways to enable different publishing options, calls-to-action, provisioning, or pricing. The publishing option and configuration of the offer type also align to the offer eligibility and technical requirements.
2119

2220
Be sure to review the storefront and offer type eligibility requirements and the technical publishing requirements before creating your offer.
2321

articles/marketplace/standard-contract.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Standard Contract | Azure Marketplace
3-
description: Standard Contract for Azure Marketplace and AppSource
2+
title: Standard Contract for Microsoft commercial marketplace
3+
description: Standard Contract for Azure Marketplace and AppSource in Partner Center
44
author: dsindona
55
ms.service: marketplace
66
ms.subservice: partnercenter-marketplace-publisher
@@ -9,9 +9,9 @@ ms.date: 04/14/2020
99
ms.author: dsindona
1010
---
1111

12-
# Standard Contract for the Microsoft commercial marketplace
12+
# Standard Contract for Microsoft commercial marketplace
1313

14-
To simplify the procurement process for customers and reduce legal complexity for software vendors, Microsoft offers a Standard Contract for the Microsoft commercial marketplace in order to help facilitate transactions in the marketplace. Rather than crafting custom terms and conditions, commercial marketplace publishers can choose to offer their software under the Standard Contract, which customers only need to vet and accept once. The Standard Contract can be found here: [https://go.microsoft.com/fwlink/?linkid=2041178](https://go.microsoft.com/fwlink/?linkid=2041178).
14+
Microsoft offers a Standard Contract for Microsoft commercial marketplace. This helps to simplify the procurement process for customers, reduce legal complexity for software vendors, and facilitate transactions in the marketplace. Rather than crafting custom terms and conditions, as a commercial marketplace publisher, you can choose to offer your software under the [Standard Contract](https://go.microsoft.com/fwlink/?linkid=2041178), which customers only need to vet and accept one time.
1515

1616
The terms and conditions for an offer are defined when creating the offer in Partner Center. You can select to use the Standard Contract for the Microsoft commercial marketplace instead of providing your own custom terms and conditions.
1717

@@ -35,7 +35,7 @@ You can leverage the Standard Contract for the Microsoft commercial marketplace
3535

3636
## Customer experience
3737

38-
During the discovery experience in Azure marketplace or AppSource, customers will be able to see the terms associated with the offer as the Standard Contract for the Microsoft commercial marketplace and any universal amendments.
38+
During the discovery experience in Azure Marketplace or AppSource, customers will be able to see the terms associated with the offer as the Standard Contract for the Microsoft commercial marketplace and any universal amendments.
3939

4040
![The Azure portal customer discovery experience.](media/marketplace-publishers-guide/azure-discovery-process.png)
4141

0 commit comments

Comments
 (0)