Skip to content

Commit 6e87ddc

Browse files
authored
Merge pull request #104702 from MicrosoftDocs/master
2/18 AM Publish
2 parents dfa543f + 6342bdd commit 6e87ddc

File tree

177 files changed

+3633
-1362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+3633
-1362
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48545,6 +48545,11 @@
4854548545
"source_path": "articles/virtual-machines/linux/ansible-manage-linux-vm.md",
4854648546
"redirect_url": "/azure/ansible/ansible-manage-linux-vm",
4854748547
"redirect_document_id": false
48548+
},
48549+
{
48550+
"source_path": "articles/app-service/containers/tutorial-java-enterprise-postgresql-app.md",
48551+
"redirect_url": "/azure/app-service/containers/configure-language-java",
48552+
"redirect_document_id": false
4854848553
}
4854948554
]
4855048555
}

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 100 additions & 11 deletions
Large diffs are not rendered by default.

articles/active-directory/cloud-provisioning/tutorial-pilot-aadc-aadccp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Same steps need to be followed for all object types (user, group and contact). R
9595
2. On the **Description** page, enter the following and click **Next**:
9696

9797
**Name:** Give the rule a meaningful name<br>
98-
**Description:** Add a meaningful description<br>
98+
**Description:** Add a meaningful description<br>
9999
**Connected System:** Choose the AAD connector that you are writing the custom sync rule for<br>
100100
**Connected System Object Type:** User<br>
101101
**Metaverse Object Type:** Person<br>

articles/active-directory/user-help/user-help-auth-app-faq.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.workload: identity
1111
ms.subservice: user-help
1212
ms.topic: conceptual
13-
ms.date: 01/16/2020
13+
ms.date: 02/18/2020
1414
ms.author: curtand
1515
ms.reviewer: olhaun
1616
---
@@ -48,6 +48,7 @@ The Microsoft Authenticator app replaced the Azure Authenticator app, and is the
4848
| Why am I getting notifications about my account activity? | To help keep you more informed about what's going on with your personal Microsoft account, we're sending activity notifications to your Microsoft Authenticator app. These notifications appear immediately after something changes, helping to keep you more secure. We previously sent these notifications through email and SMS, and have now expanded to include the app. For more information about these activity notifications, see [What happens if there's an unusual sign-in to your account](https://support.microsoft.com/help/13967/microsoft-account-unusual-sign-in). To change where you receive your notifications, sign in to the [Where can we contact you with non-critical account alerts](https://account.live.com/SecurityNotifications/Update) page of your account. |
4949
| While signing in to my work or school account using the default mail app that comes with iOS, I get prompted by the Microsoft Authenticator app for my security verification information. After I enter that information and return to the mail app, I get an error. What can I do? | This most-likely happens because your sign-in and your mail app are occurring across two different apps, causing the initial background sign-in process to stop working and to fail. To try to fix this, we recommend you select the **Safari** icon on the bottom right side of the screen while signing in to your mail app. By moving to Safari, the whole sign-in process happens in a single app, allowing you to sign in to the app successfully. |
5050
| My one-time password (OTP) codes are not working. What should I do? | Make sure the date and time on your device are correct and are being automatically synced. If the date and time is wrong, or out of sync, the code won’t work. |
51+
| The Windows 10 Mobile operating system was deprecated December 2019. Will the Microsoft Authenticator on Windows Mobile operating systems be deprecated as well? | The Microsoft Authenticator app on all Windows Mobile operating systems will not be supported after Feb 28, 2020. Users will not be eligible for receiving any new updates to the app post the aforementioned date. After Feb 28, 2020 Microsoft services that currently support authentications using the Microsoft Authenticator on all Windows Mobile operating systems will begin to retire their support. In order to authenticate into Microsoft services, we strongly encourage all our users to switch to an alternate authentication mechanism prior to this date. |
5152

5253
## Next steps
5354

articles/aks/use-multiple-node-pools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ az aks nodepool add \
479479
> [!NOTE]
480480
> You can also use the `--tags` parameter when using [az aks nodepool update][az-aks-nodepool-update] command as well as during cluster creation. During cluster creation, the `--tags` parameter applies the tag to the initial node pool created with the cluster. All tag names must adhere to the limitations in [Use tags to organize your Azure resources][tag-limitation]. Updating a node pool with the `--tags` parameter updates any existing tag values and appends any new tags. For example, if your node pool had *dept=IT* and *costcenter=9999* for tags and you updated it with *team=dev* and *costcenter=111* for tags, you nodepool would have *dept=IT*, *costcenter=111*, and *team=dev* for tags.
481481

482-
The following example output from the [az aks nodepool list][az-aks-nodepool-list] command shows that *taggednodepool* is *Creating* nodes with the specified *tag*:
482+
The following example output from the [az aks nodepool list][az-aks-nodepool-list] command shows that *tagnodepool* is *Creating* nodes with the specified *tag*:
483483

484484
```console
485485
$ az aks nodepool list -g myResourceGroup --cluster-name myAKSCluster

articles/app-service/configure-language-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ Java applications running in App Service have the same set of [security best pra
124124

125125
Set up app authentication in the Azure portal with the **Authentication and Authorization** option. From there, you can enable authentication using Azure Active Directory or social logins like Facebook, Google, or GitHub. Azure portal configuration only works when configuring a single authentication provider. For more information, see [Configure your App Service app to use Azure Active Directory login](configure-authentication-provider-aad.md) and the related articles for other identity providers. If you need to enable multiple sign-in providers, follow the instructions in the [customize App Service authentication](app-service-authentication-how-to.md) article.
126126

127-
#### Tomcat and Wildfly
127+
#### Tomcat
128128

129-
Your Tomcat or Wildfly application can access the user's claims directly from the servlet by casting the Principal object to a Map object. The Map object will map each claim type to a collection of the claims for that type. In the code below, `request` is an instance of `HttpServletRequest`.
129+
Your Tomcat application can access the user's claims directly from the servlet by casting the Principal object to a Map object. The Map object will map each claim type to a collection of the claims for that type. In the code below, `request` is an instance of `HttpServletRequest`.
130130

131131
```java
132132
Map<String, Collection<String>> map = (Map<String, Collection<String>>) request.getUserPrincipal();

articles/app-service/containers/app-service-linux-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can find all Docker files on [GitHub](https://github.com/azure-app-service).
2828
| Stack | Expected Value |
2929
|-----------------|----------------------------------------------------------------------------------------|
3030
| Java SE | the command to start your JAR app (for example, `java -jar /home/site/wwwroot/app.jar --server.port=80`) |
31-
| Tomcat, Wildfly | the location of a script to perform any necessary configurations (for example, `/home/site/deployments/tools/startup_script.sh`) |
31+
| Tomcat | the location of a script to perform any necessary configurations (for example, `/home/site/deployments/tools/startup_script.sh`) |
3232
| Node.js | the PM2 configuration file or your script file |
3333
| .Net Core | the compiled DLL name as `dotnet <myapp>.dll` |
3434
| Ruby | the Ruby script that you want to initialize your app with |

0 commit comments

Comments
 (0)