Skip to content

Commit a74b0ee

Browse files
authored
Merge pull request #46858 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 83d2a08 + f768b92 commit a74b0ee

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

articles/active-directory/manage-apps/tenant-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Tenant Restrictions is currently supported by Office 365 browser-based applicati
112112

113113
Outlook and Skype for Business clients that support modern authentication may still able to use legacy protocols against tenants where modern authentication is not enabled, effectively bypassing Tenant Restrictions. Applications that use legacy protocols may be blocked by Tenant Restrictions if they contact login.microsoftonline.com, login.microsoft.com, or login.windows.net during authentication.
114114

115-
For Outlook on Windows, customers may choose to implement restrictions preventing end users from adding non-approved mail accounts to their profiles. For example, see the [Prevent adding non-default Exchange accounts](http://gpsearch.azurewebsites.net/default.aspx?ref=1) group policy setting. For Outlook on non-Windows platforms, and for Skype for Business on all platforms, full support for Tenant Restrictions is not currently available.
115+
For Outlook on Windows, customers may choose to implement restrictions preventing end users from adding non-approved mail accounts to their profiles. For example, see the [Prevent adding non-default Exchange accounts](http://gpsearch.azurewebsites.net/default.aspx?ref=1) group policy setting.
116116

117117
## Testing
118118

articles/cognitive-services/text-analytics/quickstarts/csharp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You must also have the [endpoint and access key](../How-tos/text-analytics-how-t
4343
## Call the Text Analytics API using the SDK
4444
1. Replace Program.cs with the code provided below. This program demonstrates the capabilities of the Text Analytics API in 3 sections (language extraction, key-phrase extraction and sentiment analysis).
4545
1. Replace the `Ocp-Apim-Subscription-Key` header value with an access key valid for your subscription.
46-
1. Replace the location in `client.AzureRegion` (currently `AzureRegions.Westus`) to the region you signed up for.
46+
1. Replace the location in `client.BaseUri` to the endpoint you signed up for. You can find the endpoint on Azure Portal resource. The endpoint typically looks like "https://[region].api.cognitive.microsoft.com/text/analytics/v2.0".
4747
1. Run the program.
4848

4949
```csharp
@@ -76,8 +76,8 @@ namespace ConsoleApp1
7676
{
7777

7878
// Create a client.
79-
ITextAnalyticsAPI client = new TextAnalyticsAPI(new ApiKeyServiceClientCredentials());
80-
client.AzureRegion = AzureRegions.Westus;
79+
ITextAnalyticsClient client = new TextAnalyticsClient(new ApiKeyServiceClientCredentials());
80+
client.BaseUri = new Uri("https://westus.api.cognitive.microsoft.com/text/analytics/v2.0");
8181

8282
Console.OutputEncoding = System.Text.Encoding.UTF8;
8383

articles/cosmos-db/sql-api-python-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Now let's create your voting application by adding new files and updating others
133133
2. Add the following code to the forms.py file, and then save the file.
134134

135135
```python
136-
from flask.ext.wtf import Form
136+
from flask_wtf import Form
137137
from wtforms import RadioField
138138

139139
class VoteForm(Form):

articles/cosmos-db/table-sdk-dotnet.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ ms.author: rnagpal
3434
3535
## Release notes
3636

37+
### <a name="1.1.3"/>1.1.3
38+
* Fixed Nuget package dependencies on Microsoft.Azure.Storage.Common and Microsoft.Azure.DocumentDB.
39+
* Bug fixes on table serialization when JsonConvert.DefaultSettings is configured.
40+
3741
### <a name="1.1.1"/>1.1.1
3842
* Added validation for malformed ETAGs in Direct Mode.
3943
* Fixed LINQ query bug in Gateway Mode.
@@ -61,6 +65,7 @@ Any requests to Azure Cosmos DB using a retired SDK are rejected by the service.
6165

6266
| Version | Release Date | Retirement Date |
6367
| --- | --- | --- |
68+
| [1.1.3](#1.1.3) |July 17, 2018|--- |
6469
| [1.1.1](#1.1.1) |March 26, 2018|--- |
6570
| [1.1.0](#1.1.0) |February 21, 2018|--- |
6671
| [1.0.0](#1.0.0) |November 15, 2017|--- |

articles/iot-hub/iot-hub-devguide-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ The result, which grants access to all functionality for device1, would be:
266266
`SharedAccessSignature sr=myhub.azure-devices.net%2fdevices%2fdevice1&sig=13y8ejUk2z7PLmvtwR5RqlGBOVwiq7rQR3WZ5xZX3N4%3D&se=1456971697`
267267

268268
> [!NOTE]
269-
> It is possible to generate a SAS token using the .NET [device explorer][lnk-device-explorer] tool or the cross-platform, Python-based [The IoT extension for Azure CLI 2.0][lnk-IoT-extension-CLI-2.0] command-line utility.
269+
> It is possible to generate a SAS token using the .NET [device explorer][lnk-device-explorer] tool or the cross-platform, Python-based [The IoT extension for Azure CLI 2.0][lnk-IoT-extension-CLI-2.0] command-line utility or the [Azure IoT Toolkit extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit).
270270
271271
### Use a shared access policy
272272

articles/log-analytics/log-analytics-agent-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ To retrieve the product code from the agent install package directly, you can us
120120
$OPSINSIGHTS_WS_KEY = Get-AutomationVariable -Name "OPSINSIGHTS_WS_KEY"
121121
122122
Import-DscResource -ModuleName xPSDesiredStateConfiguration
123-
Import-DscResource ModuleName PSDesiredStateConfiguration
123+
Import-DscResource -ModuleName PSDesiredStateConfiguration
124124
125125
Node OMSnode {
126126
Service OIService
@@ -174,4 +174,4 @@ In the search results returned, you should see heartbeat records for the compute
174174
175175
## Next steps
176176
177-
Review [Managing and maintaining the Log Analytics agent for Windows and Linux](log-analytics-agent-manage.md) to learn about how to manage the agent during its deployment lifecycle on your machines.
177+
Review [Managing and maintaining the Log Analytics agent for Windows and Linux](log-analytics-agent-manage.md) to learn about how to manage the agent during its deployment lifecycle on your machines.

articles/sql-database/elastic-jobs-tsql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Connect to the [*job database*](elastic-jobs-overview.md#job-database) and run t
7575
--Connect to the job database specified when creating the job agent
7676

7777
-- Add a target group containing server(s)
78-
EXEC [jobs].sp_add_target_group = N'ServerGroup'
78+
EXEC [jobs].sp_add_target_group N'ServerGroup'
7979
GO
8080

8181
-- Add a server target member
@@ -1337,4 +1337,4 @@ Shows all members of all target groups.
13371337

13381338
- [Create and manage Elastic Jobs using PowerShell](elastic-jobs-powershell.md)
13391339
- [Authorization and Permissions SQL Server](https://docs.microsoft.com/dotnet/framework/data/adonet/sql/authorization-and-permissions-in-sql-server)
1340-
1340+

0 commit comments

Comments
 (0)