Skip to content

Commit efef137

Browse files
authored
Merge pull request #96646 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 ce46fdd + 9bea8a1 commit efef137

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

articles/azure-resource-manager/programmatically-create-subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ Use the `description` property to identify the reseller who will be associated w
484484

485485
The following example creates a subscription named *Dev Team subscription* for *Fabrikam toys* and associate *Wingtip* reseller to the subscription. T
486486

487-
Make the following request, replacing `<customerId>` with the `id` copied from the first step (```/providers/Microsoft.Billing/billingAccounts/99a13315-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_xxxx-xx-xx/customers/2281f543-xxxx-xxxx-xxxx-xxxxxxxxxxxx```). Pass the optional *resellerId* copied from the second step in the request parameters of the API.
487+
Make the following request, replacing `<customerId>` with the `id` copied from the second step (```/providers/Microsoft.Billing/billingAccounts/99a13315-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_xxxx-xx-xx/customers/2281f543-xxxx-xxxx-xxxx-xxxxxxxxxxxx```). Pass the optional *resellerId* copied from the second step in the request parameters of the API.
488488

489489
```json
490490
POST https://management.azure.com<customerId>/providers/Microsoft.Subscription/createSubscription?api-version=2018-11-01-preview

articles/cognitive-services/text-analytics/text-analytics-user-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Use Key Phrase Extraction and Entity Recognition to process support requests sub
3636

3737
## Monitor your product’s social media feeds​
3838

39-
Monitor user product feedback on your product’s twitter or Facebook page. Use the data to analyze customer sentiment toward new products launches, extract key phrases about features and feature requests, or address customer complaints as they happen.
39+
Monitor user product feedback on your product’s twitter or Facebook page. Use the data to analyze customer sentiment toward new products launches, extract key phrases about features and feature requests, or address customer complaints as they happen. See the example [Microsoft Flow template](https://flow.microsoft.com/galleries/public/templates/2680d2227d074c4d901e36c66e68f6f9/run-sentiment-analysis-on-tweets-and-push-results-to-a-power-bi-dataset/)​.
4040

4141
![An image describing how to monitor your product and company feedback on social media using key phrase extraction](media/use-cases/social-feed.svg)
4242

articles/governance/policy/how-to/remediate-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,5 +241,5 @@ module.
241241
- Review the [Azure Policy definition structure](../concepts/definition-structure.md).
242242
- Review [Understanding policy effects](../concepts/effects.md).
243243
- Understand how to [programmatically create policies](programmatically-create.md).
244-
- Learn how to [get compliance data](getting-compliance-data.md).
245-
- Review what a management group is with [Organize your resources with Azure management groups](../../management-groups/overview.md).
244+
- Learn how to [get compliance data](get-compliance-data.md).
245+
- Review what a management group is with [Organize your resources with Azure management groups](../../management-groups/overview.md).

articles/iot-dps/about-iot-dps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The Device Provisioning Service has many features, making it ideal for provision
7373

7474
* **Secure attestation** support for both X.509 and TPM-based identities.
7575
* **Enrollment list** containing the complete record of devices/groups of devices that may at some point register. The enrollment list contains information about the desired configuration of the device once it registers, and it can be updated at any time.
76-
* **Multiple allocation policies** to control how the Device Provisioning Service assigns devices to IoT hubs in support of your scenarios.
76+
* **Multiple allocation policies** to control how the Device Provisioning Service assigns devices to IoT hubs in support of your scenarios: Lowest latency, evenly weighted distribution (default), and static configuration via the enrollment list. Note that latency is determined using the same method as [Traffic Manager](https://docs.microsoft.com/azure/traffic-manager/traffic-manager-routing-methods#performance).
7777
* **Monitoring and diagnostics logging** to make sure everything is working properly.
7878
* **Multi-hub support** allows the Device Provisioning Service to assign devices to more than one IoT hub. The Device Provisioning Service can talk to hubs across multiple Azure subscriptions.
7979
* **Cross-region support** allows the Device Provisioning Service to assign devices to IoT hubs in other regions.

articles/storage/files/storage-troubleshoot-windows-file-connection-problems.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ If the connection was successful, you should see the following output:
8888
### Solution for cause 1
8989

9090
#### Solution 1 - Use Azure File Sync
91-
Azure File Sync can transforms your on-premises Windows Server into a quick cache of your Azure file share. You can use any protocol that's available on Windows Server to access your data locally, including SMB, NFS, and FTPS. Azure File Sync works over port 443 and can thus be used as a workaround to access Azure Files from clients that have port 445 blocked. [Learn how to setup Azure File Sync](https://docs.microsoft.com/azure/storage/files/storage-sync-files-extend-servers).
91+
Azure File Sync can transform your on-premises Windows Server into a quick cache of your Azure file share. You can use any protocol that's available on Windows Server to access your data locally, including SMB, NFS, and FTPS. Azure File Sync works over port 443 and can thus be used as a workaround to access Azure Files from clients that have port 445 blocked. [Learn how to setup Azure File Sync](https://docs.microsoft.com/azure/storage/files/storage-sync-files-extend-servers).
9292

9393
#### Solution 2 - Use VPN
9494
By Setting up a VPN to your specific Storage Account, the traffic will go through a secure tunnel as opposed to over the internet. Follow the [instructions to setup VPN](https://github.com/Azure-Samples/azure-files-samples/tree/master/point-to-site-vpn-azure-files

0 commit comments

Comments
 (0)