Skip to content

Commit 38fa152

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into adfssismove
2 parents 65b2596 + cb32c31 commit 38fa152

23 files changed

+145
-60
lines changed

articles/active-directory/authentication/active-directory-certificate-based-authentication-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Android devices can use certificate-based authentication (CBA) to authenticate t
2424

2525
Configuring this feature eliminates the need to enter a username and password combination into certain mail and Microsoft Office applications on your mobile device.
2626

27-
This topic provides you with the requirements and the supported scenarios for configuring CBA on an iOS(Android) device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
27+
This topic provides you with the requirements and the supported scenarios for configuring CBA on an Android device for users of tenants in Office 365 Enterprise, Business, Education, US Government, China, and Germany plans.
2828

2929
This feature is available in preview in Office 365 US Government Defense and Federal plans.
3030

articles/active-directory/hybrid/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@
210210
href: how-to-connect-pta-quick-start.md
211211
- name: Pass-through authentication FAQ
212212
href: how-to-connect-pta-faq.md
213+
- name: Disable PTA with Azure AD Connect "Do not configure"
214+
href: how-to-connect-pta-disable-do-not-configure.md
213215
- name: Manage Federation Services
214216
items:
215217
- name: Managing federation with Azure AD Connect
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
title: 'Disable PTA when using Azure AD Connect "Do not configure" | Microsoft Docs'
3+
description: This article describes how to disable PTA with the Azure AD Connect "do not configure" feature.
4+
services: active-directory
5+
author: billmath
6+
manager: daveba
7+
ms.service: active-directory
8+
ms.topic: reference
9+
ms.workload: identity
10+
ms.date: 04/20/2020
11+
ms.subservice: hybrid
12+
ms.author: billmath
13+
ms.collection: M365-identity-device-management
14+
---
15+
16+
17+
# Disable PTA when using Azure AD Connect "Do not configure"
18+
19+
If you are using Pass-through Authentication with Azure AD Connect and you have it set to "Do not configure", you can disable it. Disabling PTA can be done using the following cmdlets.
20+
21+
## Prerequisites
22+
The following prerequisites are required:
23+
- Any windows machine that has the PTA agent installed.
24+
- Agent must be at version 1.5.1742.0 or later.
25+
- An Azure global administrator account in order to run the PowerShell cmdlets to disable PTA.
26+
27+
>[!NOTE]
28+
> If your agent is older then it may not have the cmdlets required to complete this operation. You can get a new agent from Azure Portal an install it on any windows machine and provide admin credentials. (Installing the agent does not affect the PTA status in the cloud)
29+
30+
> [!IMPORTANT]
31+
> If you are using the Azure Government cloud then you will have to pass in the ENVIRONMENTNAME parameter with the following value.
32+
>
33+
>| Environment Name | Cloud |
34+
>| - | - |
35+
>| AzureUSGovernment | US Gov|
36+
37+
38+
## To disable PTA
39+
From within a PowerShell session, use the following to disable PTA:
40+
1. PS C:\Program Files\Microsoft Azure AD Connect Authentication Agent> `Import-Module .\Modules\PassthroughAuthPSModule`
41+
2. `Get-PassthroughAuthenticationEnablementStatus -Feature PassthroughAuth` or `Get-PassthroughAuthenticationEnablementStatus -Feature PassthroughAuth -EnvironmentName <identifier>`
42+
3. `Disable-PassthroughAuthentication -Feature PassthroughAuth` or `Disable-PassthroughAuthentication -Feature PassthroughAuth -EnvironmentName <identifier>`
43+
44+
## If you don't have access to an agent
45+
46+
If you do not have an agent machine you can use following command to install an agent.
47+
48+
1. Download the latest Auth Agent from portal.azure.com.
49+
2. Install the feature: `.\AADConnectAuthAgentSetup.exe` or `.\AADConnectAuthAgentSetup.exe ENVIRONMENTNAME=<identifier>`
50+
51+
52+
## Next steps
53+
54+
- [User sign-in with Azure Active Directory Pass-through Authentication](how-to-connect-pta.md)

articles/active-directory/hybrid/plan-connect-userprincipalname.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ On-Premises user object:
8888
- mailNickName : &lt;not set&gt;
8989
- proxyAddresses : {SMTP:us1@contoso.com}
9090
91-
- userPrincipalName : [email protected]`
91+
- userPrincipalName : [email protected]
9292

9393
Synchronized the user object to Azure AD Tenant for the first time
9494
- Set Azure AD MailNickName attribute to primary SMTP address prefix.

articles/active-directory/saas-apps/ally-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8989
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
9090

9191
In the **Sign-on URL** text box, type a URL:
92-
`https://app.ally.io/`
92+
`https://app.ally.io/saml/consume/<CUSTOM_GUID>`
9393

9494
> [!NOTE]
9595
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Ally Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
@@ -145,7 +145,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
145145

146146
## Configure Ally SSO
147147

148-
To configure single sign-on on **Ally** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Ally support team](mailto:contact@ally.io). They set this setting to have the SAML SSO connection set properly on both sides.
148+
To configure single sign-on on **Ally** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Ally support team](mailto:support@ally.io). They set this setting to have the SAML SSO connection set properly on both sides.
149149

150150
### Create Ally test user
151151

articles/app-service/containers/quickstart-nodejs.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ When prompted, choose to enable logging and restart the application. Once the ap
158158

159159
After a few seconds, you'll see a message indicating that you're connected to the log-streaming service. Refresh the page a few times to see more activity.
160160

161-
```bash
162-
2019-09-20 20:37:39.574 INFO - Initiating warmup request to container msdocs-vscode-node_2_00ac292a for site msdocs-vscode-node
163-
2019-09-20 20:37:55.011 INFO - Waiting for response to warmup request for container msdocs-vscode-node_2_00ac292a. Elapsed time = 15.4373071 sec
164-
2019-09-20 20:38:08.233 INFO - Container msdocs-vscode-node_2_00ac292a for site msdocs-vscode-node initialized successfully and is ready to serve requests.
165-
2019-09-20T20:38:21 Startup Request, url: /Default.cshtml, method: GET, type: request, pid: 61,1,7, SCM_SKIP_SSL_VALIDATION: 0, SCM_BIN_PATH: /opt/Kudu/bin, ScmType: None
166-
```
161+
<pre>
162+
2019-09-20 20:37:39.574 INFO - Initiating warmup request to container msdocs-vscode-node_2_00ac292a for site msdocs-vscode-node
163+
2019-09-20 20:37:55.011 INFO - Waiting for response to warmup request for container msdocs-vscode-node_2_00ac292a. Elapsed time = 15.4373071 sec
164+
2019-09-20 20:38:08.233 INFO - Container msdocs-vscode-node_2_00ac292a for site msdocs-vscode-node initialized successfully and is ready to serve requests.
165+
2019-09-20T20:38:21 Startup Request, url: /Default.cshtml, method: GET, type: request, pid: 61,1,7, SCM_SKIP_SSL_VALIDATION: 0, SCM_BIN_PATH: /opt/Kudu/bin, ScmType: None
166+
</pre>
167167

168168
> [!div class="nextstepaction"]
169169
> [I ran into an issue](https://www.research.net/r/PWZWZ52?tutorial=node-deployment-azure-app-service&step=tailing-logs)

articles/azure-monitor/app/asp-net-core.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ The preceding steps are enough to help you start collecting server-side telemetr
158158

159159
Alternatively to using the `FullScript` the `ScriptBody` is available starting in SDK v2.14. Use this if you need to control the `<script>` tag to set a Content Security Policy:
160160

161-
```cshtml
162-
<script> // apply custom changes to this script tag.
163-
@Html.Raw(JavaScriptSnippet.ScriptBody)
164-
</script>
165-
```
161+
```cshtml
162+
<script> // apply custom changes to this script tag.
163+
@Html.Raw(JavaScriptSnippet.ScriptBody)
164+
</script>
165+
```
166166

167167
The `.cshtml` file names referenced earlier are from a default MVC application template. Ultimately, if you want to properly enable client-side monitoring for your application, the JavaScript snippet must appear in the `<head>` section of each page of your application that you want to monitor. You can accomplish this goal for this application template by adding the JavaScript snippet to `_Layout.cshtml`.
168168

articles/cognitive-services/LUIS/luis-get-started-get-intent-from-browser.md

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
---
22
title: "Quickstart: Get intent with browser - LUIS"
3-
titleSuffix: Azure Cognitive Services
43
description: In this quickstart, use an available public LUIS app to determine a user's intention from conversational text in a browser.
5-
services: cognitive-services
6-
author: diberry
7-
manager: nitinme
8-
ms.custom: seodec18
9-
ms.service: cognitive-services
10-
ms.subservice: language-understanding
114
ms.topic: quickstart
12-
ms.date: 02/03/2020
13-
ms.author: diberry
5+
ms.date: 04/20/2020
146
#Customer intent: As an developer familiar with how to use a browser but new to the LUIS service, I want to query the LUIS endpoint of a published model so that I can see the JSON prediction response.
157
---
168

@@ -22,29 +14,31 @@ To understand what a LUIS prediction endpoint returns, view a prediction result
2214

2315
In order to query a public app, you need:
2416

25-
* Your own Language Understanding (LUIS) Authoring or Prediction key which can be obtained from [LUIS Portal (Preview)](https://preview.luis.ai/). If you do not already have a subscription to create a key, you can register for a [free account](https://azure.microsoft.com/free/).
26-
* The public app's ID: `df67dcdb-c37d-46af-88e1-8b97951ca1c2`.
17+
* Your Language Understanding (LUIS) resource information:
18+
* **Prediction key** - which can be obtained from [LUIS Portal](https://www.luis.ai/). If you do not already have a subscription to create a key, you can register for a [free account](https://azure.microsoft.com/free/).
19+
* **Prediction endpoint subdomain** - the subdomain is also the **name** of your LUIS resource.
20+
* A LUIS app ID - use the public IoT app ID of `df67dcdb-c37d-46af-88e1-8b97951ca1c2`. The user query used in the quickstart code is specific to that app.
2721

2822
## Use the browser to see predictions
2923

3024
1. Open a web browser.
31-
1. Use the complete URLs below, replacing `YOUR-KEY` with your own LUIS Authoring or Prediction key. The requests are GET requests and include the authorization, with your LUIS Authoring or Prediction key, as a query string parameter.
25+
1. Use the complete URLs below, replacing `YOUR-KEY` with your own LUIS Prediction key. The requests are GET requests and include the authorization, with your LUIS Prediction key, as a query string parameter.
3226

3327
#### [V3 prediction request](#tab/V3-1-1)
3428

3529

3630
The format of the V3 URL for a **GET** endpoint (by slots) request is:
3731

3832
`
39-
https://westus.api.cognitive.microsoft.com/luis/prediction/v3.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2/slots/production/predict?query=turn on all lights&subscription-key=YOUR-KEY
33+
https://YOUR-LUIS-ENDPOINT-SUBDOMAIN.api.cognitive.microsoft.com/luis/prediction/v3.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2/slots/production/predict?query=turn on all lights&subscription-key=YOUR-LUIS-PREDICTION-KEY
4034
`
4135

4236
#### [V2 prediction request](#tab/V2-1-2)
4337

4438
The format of the V2 URL for a **GET** endpoint request is:
4539

4640
`
47-
https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2?subscription-key=YOUR-KEY&q=turn on all lights
41+
https://YOUR-LUIS-ENDPOINT-SUBDOMAIN.api.cognitive.microsoft.com/luis/v2.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2?subscription-key=YOUR-LUIS-PREDICTION-KEY&q=turn on all lights
4842
`
4943

5044
1. Paste the URL into a browser window and press Enter. The browser displays a JSON result that indicates that LUIS detects the `HomeAutomation.TurnOn` intent as the top intent and the `HomeAutomation.Operation` entity with the value `on`.
@@ -100,7 +94,7 @@ In order to query a public app, you need:
10094
Add `show-all-intents=true` to the end of the querystring to **show all intents**:
10195

10296
`
103-
https://westus.api.cognitive.microsoft.com/luis/predict/v3.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2/slots/production/predict?query=turn on all lights&subscription-key=YOUR-KEY&show-all-intents=true
97+
https://YOUR-LUIS-ENDPOINT-SUBDOMAIN.api.cognitive.microsoft.com/luis/predict/v3.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2/slots/production/predict?query=turn on all lights&subscription-key=YOUR-LUIS-PREDICTION-KEY&show-all-intents=true
10498
`
10599

106100
```JSON
@@ -133,7 +127,7 @@ In order to query a public app, you need:
133127
Add `verbose=true` to the end of the querystring to **show all intents**:
134128

135129
`
136-
https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2?q=turn on all lights&subscription-key={your-key}&verbose=true
130+
https://YOUR-LUIS-ENDPOINT-SUBDOMAIN.api.cognitive.microsoft.com/luis/v2.0/apps/df67dcdb-c37d-46af-88e1-8b97951ca1c2?q=turn on all lights&subscription-key=YOUR-LUIS-PREDICTION-KEY&verbose=true
137131
`
138132

139133
```json
@@ -169,12 +163,11 @@ In order to query a public app, you need:
169163
}
170164
```
171165

172-
173-
<!-- FIX - is the public app getting updated for the new prebuilt domain with entities? -->
174-
175166
## Next steps
176167

177-
Learn more about the [V3 prediction endpoint](luis-migration-api-v3.md).
168+
Learn more about:
169+
* [V3 prediction endpoint](luis-migration-api-v3.md)
170+
* [Custom subdomains](../cognitive-services-custom-subdomains.md)
178171

179172
> [!div class="nextstepaction"]
180173
> [Create an app in the LUIS portal](get-started-portal-build-app.md)

articles/cognitive-services/Translator/language-support.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The V3 Translator API is neural by default and statistical systems are only avai
5858
|French| `fr` | Neural|
5959
|German| `de` | Neural|
6060
|Greek| `el` | Neural|
61+
|Gujarati| `gu` | Neural|
6162
|Haitian Creole| `ht` |Statistical|
6263
|Hebrew |`he` |Neural
6364
|Hindi| `hi` | Neural|
@@ -80,6 +81,7 @@ The V3 Translator API is neural by default and statistical systems are only avai
8081
|Malayalam| `ml` | Neural
8182
|Maltese| `mt` | Statistical|
8283
|Maori| `mi` | Neural|
84+
|Marathi| `mr` | Neural|
8385
|Norwegian| `nb` | Neural|
8486
|Persian| `fa` | Neural|
8587
|Polish| `pl` | Neural|

articles/governance/policy/concepts/assignment-structure.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Details of the policy assignment structure
33
description: Describes the policy assignment definition used by Azure Policy to relate policy definitions and parameters to resources for evaluation.
4-
ms.date: 09/23/2019
4+
ms.date: 04/15/2020
55
ms.topic: conceptual
66
---
77
# Azure Policy assignment structure
@@ -17,6 +17,7 @@ You use JSON to create a policy assignment. The policy assignment contains eleme
1717
- description
1818
- metadata
1919
- enforcement mode
20+
- excluded scopes
2021
- policy definition
2122
- parameters
2223

@@ -31,6 +32,7 @@ For example, the following JSON shows a policy assignment in _DoNotEnforce_ mode
3132
"assignedBy": "Cloud Center of Excellence"
3233
},
3334
"enforcementMode": "DoNotEnforce",
35+
"notScopes": [],
3436
"policyDefinitionId": "/subscriptions/{mySubscriptionID}/providers/Microsoft.Authorization/policyDefinitions/ResourceNaming",
3537
"parameters": {
3638
"prefix": {
@@ -72,6 +74,14 @@ If **enforcementMode** isn't specified in a policy or initiative definition, the
7274
used. [Remediation tasks](../how-to/remediate-resources.md) can be started for [deployIfNotExists](./effects.md#deployifnotexists)
7375
policies, even when **enforcementMode** is set to _DoNotEnforce_.
7476

77+
## Excluded scopes
78+
79+
The **scope** of the assignment includes all child resource containers and child resources. If a
80+
child resource container or child resource shouldn't have the definition applied, each can be
81+
excluded from evaluation by setting **notScopes**. This property is an array to enable excluding one
82+
or more resource containers or resources from evaluation. **notScopes** can be added or updated
83+
after creation of the initial assignment.
84+
7585
## Policy definition ID
7686

7787
This field must be the full path name of either a policy definition or an initiative definition.

0 commit comments

Comments
 (0)