Skip to content

Commit 9b458e9

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cats97
2 parents 2422f64 + 7ab4dd8 commit 9b458e9

File tree

14 files changed

+314
-242
lines changed

14 files changed

+314
-242
lines changed

articles/active-directory/b2b/add-users-administrator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
# Add Azure Active Directory B2B collaboration users in the Azure portal
2121

22-
As a user who is assigned any of the limited administrator directory roles, you can use the Azure portal to invite B2B collaboration users. You can invite guest users to the directory, to a group, or to an application. After you invite a user through any of these methods, the invited user's account is added to Azure Active Directory (Azure AD), with a user type of *Guest*. The guest user must then redeem their invitation to access resources.
22+
As a user who is assigned any of the limited administrator directory roles, you can use the Azure portal to invite B2B collaboration users. You can invite guest users to the directory, to a group, or to an application. After you invite a user through any of these methods, the invited user's account is added to Azure Active Directory (Azure AD), with a user type of *Guest*. The guest user must then redeem their invitation to access resources. An invitation of a user does not expire.
2323

2424
After you add a guest user to the directory, you can either send the guest user a direct link to a shared app, or the guest user can click the redemption URL in the invitation email. For more information about the redemption process, see [B2B collaboration invitation redemption](redemption-experience.md).
2525

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ It takes a few minutes to create the cluster and configure the cluster autoscale
100100
## Change the cluster autoscaler settings
101101

102102
> [!IMPORTANT]
103-
> If you have the *multiple agent pools* feature enabled on your subscription, skip to the [autoscale with multiple agent pools section](##use-the-cluster-autoscaler-with-multiple-node-pools-enabled). Clusters with multiple agent pools enabled require use of the `az aks nodepool` command set to change node pool specific properties instead of `az aks`. The below instructions assume you have not enabled multiple node pools. To check if you have it enabled, run `az feature list -o table` and look for `Microsoft.ContainerService/multiagentpoolpreview`.
103+
> If you have the *multiple agent pools* feature enabled on your subscription, skip to the [autoscale with multiple agent pools section](#use-the-cluster-autoscaler-with-multiple-node-pools-enabled). Clusters with multiple agent pools enabled require use of the `az aks nodepool` command set to change node pool specific properties instead of `az aks`. The below instructions assume you have not enabled multiple node pools. To check if you have it enabled, run `az feature list -o table` and look for `Microsoft.ContainerService/multiagentpoolpreview`.
104104
105105
In the previous step to create an AKS cluster or update an existing node pool, the cluster autoscaler minimum node count was set to *1*, and the maximum node count was set to *3*. As your application demands change, you may need to adjust the cluster autoscaler node count.
106106

articles/aks/coredns-custom.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ To learn more about core network concepts, see [Network concepts for application
185185
[coredns]: https://coredns.io/
186186
[corednsk8s]: https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#coredns
187187
[dnscache]: https://coredns.io/plugins/cache/
188+
[aks-quickstart-cli]: https://docs.microsoft.com/en-us/azure/aks/kubernetes-walkthrough
189+
[aks-quickstart-portal]: https://docs.microsoft.com/en-us/azure/aks/kubernetes-walkthrough-portal
188190
[kubectl-apply]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#apply
189191
[kubectl-get]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
190192
[kubectl delete]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#delete
@@ -193,4 +195,4 @@ To learn more about core network concepts, see [Network concepts for application
193195
<!-- LINKS - internal -->
194196
[concepts-network]: concepts-network.md
195197
[aks-quickstart-cli]: kubernetes-walkthrough.md
196-
[aks-quickstart-portal]: kubernetes-walkthrough-portal.md
198+
[aks-quickstart-portal]: kubernetes-walkthrough-portal.md

articles/app-service/containers/how-to-serve-content-from-azure-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: msangapu
1212
---
1313
# Serve content from Azure Storage in App Service on Linux
1414

15-
This guide shows how to serve static content in App Service on Linux by using [Azure Storage](/azure/storage/common/storage-introduction). Benefits include secured content, content portability, access to multiple apps, and multiple transferring methods.
15+
This guide shows how to serve static content in App Service on Linux by using [Azure Storage](/azure/storage/common/storage-introduction). Benefits include secured content, content portability, persistent storage, access to multiple apps, and multiple transferring methods.
1616

1717
## Prerequisites
1818

articles/azure-monitor/app/custom-operations-tracking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ Each Application Insights operation (request or dependency) involves `Activity`
482482
## Next steps
483483

484484
- Learn the basics of [telemetry correlation](correlation.md) in Application Insights.
485-
- Check out how correlated data powers [Transaction Diagnostics Experience](/azure-monitor/app/transaction-diagnostics) and [Application Map](/azure-monitor/app/app-map).
485+
- Check out how correlated data powers [Transaction Diagnostics Experience](../../azure-monitor/app/transaction-diagnostics.md) and [Application Map](../../azure-monitor/app/app-map.md).
486486
- See the [data model](../../azure-monitor/app/data-model.md) for Application Insights types and data model.
487487
- Report custom [events and metrics](../../azure-monitor/app/api-custom-events-metrics.md) to Application Insights.
488488
- Check out standard [configuration](configuration-with-applicationinsights-config.md#telemetry-initializers-aspnet) for context properties collection.

articles/cognitive-services/Bing-Web-Search/web-search-sdk-quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ This sample uses the `count` and `offset` parameters to limit the number of resu
238238
{
239239
try
240240
{
241-
var webData = await client.Web.SearchAsync(query: "Best restaurants in Seattle", offset: 10, count: 20).Result;
241+
var webData = await client.Web.SearchAsync(query: "Best restaurants in Seattle", offset: 10, count: 20);
242242
Console.WriteLine("\r\nSearching for \" Best restaurants in Seattle \"");
243243

244244
if (webData?.WebPages?.Value?.Count > 0)
@@ -298,7 +298,7 @@ This sample uses the `response_filter` parameter to filter search results. The s
298298
try
299299
{
300300
IList<string> responseFilterstrings = new List<string>() { "news" };
301-
var webData = await client.Web.SearchAsync(query: "Microsoft", responseFilter: responseFilterstrings).Result;
301+
var webData = await client.Web.SearchAsync(query: "Microsoft", responseFilter: responseFilterstrings);
302302
Console.WriteLine("\r\nSearching for \" Microsoft \" with response filter \"news\"");
303303

304304
if (webData?.News?.Value?.Count > 0)
@@ -361,7 +361,7 @@ This sample uses the `answer_count`, `promote`, and `safe_search` parameters to
361361
try
362362
{
363363
IList<string> promoteAnswertypeStrings = new List<string>() { "videos" };
364-
var webData = await client.Web.SearchAsync(query: "Music Videos", answerCount: 2, promote: promoteAnswertypeStrings, safeSearch: SafeSearch.Strict).Result;
364+
var webData = await client.Web.SearchAsync(query: "Music Videos", answerCount: 2, promote: promoteAnswertypeStrings, safeSearch: SafeSearch.Strict);
365365
Console.WriteLine("\r\nSearching for \"Music Videos\"");
366366

367367
if (webData?.Videos?.Value?.Count > 0)

articles/cognitive-services/text-analytics/whats-new.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: text-analytics
1010
ms.topic: conceptual
11-
ms.date: 07/30/2019
11+
ms.date: 09/13/2019
1212
ms.author: aahi
1313
---
1414

1515
# What's new in the Text Analytics API?
1616

1717
The Text Analytics API is updated on an ongoing basis. To stay up-to-date with recent developments, this article provides you with information about new releases and features.
1818

19-
## Sentiment Analysis v3 public preview - July 2019
19+
## Sentiment Analysis v3 public preview - September 2019
2020

2121
The next version of Sentiment Analysis is now available for public preview, and provides significant improvements in the accuracy and detail of the API's text categorization and scoring. It additionally provides:
2222

2323
* Automatic labeling for different sentiments in text.
2424
* Sentiment analysis and output on a document and sentence level.
2525

26-
It supports English and is available in three regions: Central Canada, East Asia, and Central US. Look for additional languages and regions to be added in subsequent releases.
26+
It supports English, Japanese, and Simplified Chinese and is available in the following regions: `Australia East`, `Central Canada`, `Central US`, `East Asia`, `East US`, `East US 2`, `North Europe`, `Southeast Asia`, `South Central US`, `UK South`, `West Europe`, and `West US 2`.
2727

2828
> [!div class="nextstepaction"]
2929
> [Learn more about Sentiment Analysis v3](how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-v3-public-preview)

articles/cosmos-db/local-emulator-release-notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ This article shows the Azure Cosmos emulator release notes with a list of featur
2121

2222
## Release notes
2323

24+
### 2.4.6
25+
26+
- This release provides parity with the features in the Azure Cosmos service as of July 2019, with the exceptions noted in [Develop locally with Azure Cosmos emulator](local-emulator.md). It also fixes several bugs related to emulator shutdown when invoked via command line and internal IP address overrides for SDK clients using direct mode connectivity.
27+
2428
### 2.4.3
2529

2630
- Disabled starting the MongoDB service by default. Only the SQL endpoint is enabled as default. The user must start the endpoint manually using the emulator's "/EnableMongoDbEndpoint" command-line option. Now, it's like all the other service endpoints, such as Gremlin, Cassandra, and Table.

0 commit comments

Comments
 (0)