Skip to content

Commit 25dd70a

Browse files
PMEds28PMEds28
authored
Merge pull request #192907 from MicrosoftDocs/main
Merge Main to Live, 4 AM
2 parents 940712a + 71ca8dd commit 25dd70a

File tree

167 files changed

+768
-4568
lines changed

Some content is hidden

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

167 files changed

+768
-4568
lines changed

‎.openpublishing.redirection.json

Lines changed: 156 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,160 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/germany/germany-developer-guide.md",
5+
"redirect_url": "/previous-versions/azure/germany/germany-developer-guide",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/germany/germany-get-started-connect-with-cli.md",
10+
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-cli",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/germany/germany-get-started-connect-with-portal.md",
15+
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-portal",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/germany/germany-get-started-connect-with-ps.md",
20+
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-ps",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/germany/germany-get-started-connect-with-vs.md",
25+
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-vs",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/germany/germany-howto-deploy-webandmobile.md",
30+
"redirect_url": "/previous-versions/azure/germany/germany-howto-deploy-webandmobile",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/germany/germany-image-gallery.md",
35+
"redirect_url": "/previous-versions/azure/germany/germany-image-gallery",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/germany/germany-manage-subscriptions.md",
40+
"redirect_url": "/previous-versions/azure/germany/germany-manage-subscriptions",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/germany/germany-migration-analytics.md",
45+
"redirect_url": "/previous-versions/azure/germany/germany-migration-analytics",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/germany/germany-migration-compute.md",
50+
"redirect_url": "/previous-versions/azure/germany/germany-migration-compute",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/germany/germany-migration-databases.md",
55+
"redirect_url": "/previous-versions/azure/germany/germany-migration-databases",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/germany/germany-migration-identity.md",
60+
"redirect_url": "/previous-versions/azure/germany/germany-migration-identity",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/germany/germany-migration-integration.md",
65+
"redirect_url": "/previous-versions/azure/germany/germany-migration-integration",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/germany/germany-migration-iot.md",
70+
"redirect_url": "/previous-versions/azure/germany/germany-migration-iot",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/germany/germany-migration-main.md",
75+
"redirect_url": "/previous-versions/azure/germany/germany-migration-main",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/germany/germany-migration-management-tools.md",
80+
"redirect_url": "/previous-versions/azure/germany/germany-migration-management-tools",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/germany/germany-migration-media.md",
85+
"redirect_url": "/previous-versions/azure/germany/germany-migration-media",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/germany/germany-migration-networking.md",
90+
"redirect_url": "/previous-versions/azure/germany/germany-migration-networking",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/germany/germany-migration-security.md",
95+
"redirect_url": "/previous-versions/azure/germany/germany-migration-security",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/germany/germany-migration-storage.md",
100+
"redirect_url": "/previous-versions/azure/germany/germany-migration-storage",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "articles/germany/germany-migration-web.md",
105+
"redirect_url": "/previous-versions/azure/germany/germany-migration-web",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "articles/germany/germany-overview-data-trustee.md",
110+
"redirect_url": "/previous-versions/azure/germany/germany-overview-data-trustee",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "articles/germany/germany-services-compute.md",
115+
"redirect_url": "/previous-versions/azure/germany/germany-services-compute",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path": "articles/germany/germany-services-database.md",
120+
"redirect_url": "/previous-versions/azure/germany/germany-services-database",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path": "articles/germany/germany-services-iot.md",
125+
"redirect_url": "/previous-versions/azure/germany/germany-services-iot",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path": "articles/germany/germany-services-networking.md",
130+
"redirect_url": "/previous-versions/azure/germany/germany-services-networking",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path": "articles/germany/germany-services-securityandidentity.md",
135+
"redirect_url": "/previous-versions/azure/germany/germany-services-securityandidentity",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "articles/germany/germany-services-storage.md",
140+
"redirect_url": "/previous-versions/azure/germany/germany-services-storage",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "articles/germany/germany-services-webandmobile.md",
145+
"redirect_url": "/previous-versions/azure/germany/germany-services-webandmobile",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "articles/germany/germany-services.md",
150+
"redirect_url": "/previous-versions/azure/germany/germany-services",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "articles/germany/germany-welcome.md",
155+
"redirect_url": "/previous-versions/azure/germany/germany-welcome",
156+
"redirect_document_id": false
157+
},
3158
{
4159
"source_path": "articles/confidential-ledger/register-ledger-service-principal.md",
5160
"redirect_url": "/azure/confidential-ledger/overview",
@@ -44124,4 +44279,4 @@
4412444279
"redirect_document_id": false
4412544280
}
4412644281
]
44127-
}
44282+
}

‎articles/active-directory-b2c/language-customization.md

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -232,36 +232,38 @@ You configure localized resources elements for the content definition and any la
232232
<!--Local account sign-up or sign-in page English-->
233233
<Localization Enabled="true">
234234
...
235-
<LocalizedResources Id="api.signuporsignin.en">
236-
<LocalizedStrings>
237-
<LocalizedString ElementType="UxElement" StringId="logonIdentifier_email">#Email Address</LocalizedString>
238-
<LocalizedString ElementType="UxElement" StringId="requiredField_email">#Please enter your email</LocalizedString>
239-
<LocalizedString ElementType="UxElement" StringId="logonIdentifier_username">#Username</LocalizedString>
240-
<LocalizedString ElementType="UxElement" StringId="password">#Password</LocalizedString>
241-
<LocalizedString ElementType="UxElement" StringId="createaccount_link">#Sign up now</LocalizedString>
242-
<LocalizedString ElementType="UxElement" StringId="requiredField_username">#Please enter your user name</LocalizedString>
243-
<LocalizedString ElementType="UxElement" StringId="createaccount_intro">#Don't have an account?</LocalizedString>
244-
<LocalizedString ElementType="UxElement" StringId="forgotpassword_link">#Forgot your password?</LocalizedString>
245-
<LocalizedString ElementType="UxElement" StringId="divider_title">#OR</LocalizedString>
246-
<LocalizedString ElementType="UxElement" StringId="cancel_message">#The user has forgotten their password</LocalizedString>
247-
<LocalizedString ElementType="UxElement" StringId="button_signin">#Sign in</LocalizedString>
248-
<LocalizedString ElementType="UxElement" StringId="social_intro">#Sign in with your social account</LocalizedString>
249-
<LocalizedString ElementType="UxElement" StringId="requiredField_password">#Please enter your password</LocalizedString>
250-
<LocalizedString ElementType="UxElement" StringId="invalid_password">#The password you entered is not in the expected format.</LocalizedString>
251-
<LocalizedString ElementType="UxElement" StringId="local_intro_username">#Sign in with your user name</LocalizedString>
252-
<LocalizedString ElementType="UxElement" StringId="local_intro_email">#Sign in with your existing account</LocalizedString>
253-
<LocalizedString ElementType="UxElement" StringId="invalid_email">#Please enter a valid email address</LocalizedString>
254-
<LocalizedString ElementType="UxElement" StringId="unknown_error">#We are having trouble signing you in. Please try again later.</LocalizedString>
255-
<LocalizedString ElementType="UxElement" StringId="email_pattern">^[a-zA-Z0-9.!#$%&amp;'^_`{}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$</LocalizedString>
256-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidPassword">#Your password is incorrect.</LocalizedString>
257-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsPrincipalDoesNotExist">#We can't seem to find your account.</LocalizedString>
258-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfOldPasswordUsed">#Looks like you used an old password.</LocalizedString>
259-
<LocalizedString ElementType="ErrorMessage" StringId="DefaultMessage">#Invalid username or password.</LocalizedString>
260-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfUserAccountDisabled">#Your account has been locked. Contact your support person to unlock it, then try again.</LocalizedString>
261-
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfUserAccountLocked">#Your account is temporarily locked to prevent unauthorized use. Try again later.</LocalizedString>
262-
<LocalizedString ElementType="ErrorMessage" StringId="AADRequestsThrottled">#There are too many requests at this moment. Please wait for some time and try again.</LocalizedString>
263-
</LocalizedStrings>
264-
</LocalizedResources>
235+
<LocalizedResources Id="api.signuporsignin.en">
236+
<LocalizedStrings>
237+
<LocalizedString ElementType="ClaimType" ElementId="signInName" StringId="DisplayName">Email Address</LocalizedString>
238+
<LocalizedString ElementType="UxElement" StringId="heading">Sign in</LocalizedString>
239+
<LocalizedString ElementType="UxElement" StringId="social_intro">Sign in with your social account</LocalizedString>
240+
<LocalizedString ElementType="UxElement" StringId="local_intro_generic">Sign in with your {0}</LocalizedString>
241+
<LocalizedString ElementType="ClaimType" ElementId="password" StringId="DisplayName">Password</LocalizedString>
242+
<LocalizedString ElementType="UxElement" StringId="requiredField_password">Please enter your password</LocalizedString>
243+
<LocalizedString ElementType="UxElement" StringId="requiredField_generic">Please enter your {0}</LocalizedString>
244+
<LocalizedString ElementType="UxElement" StringId="invalid_generic">Please enter a valid {0}</LocalizedString>
245+
<LocalizedString ElementType="UxElement" StringId="createaccount_one_link">Sign up now</LocalizedString>
246+
<LocalizedString ElementType="UxElement" StringId="createaccount_two_links">Sign up with {0} or {1}</LocalizedString>
247+
<LocalizedString ElementType="UxElement" StringId="createaccount_three_links">Sign up with {0}, {1}, or {2}</LocalizedString>
248+
<LocalizedString ElementType="UxElement" StringId="forgotpassword_link">Forgot your password?</LocalizedString>
249+
<LocalizedString ElementType="UxElement" StringId="button_signin">Sign in</LocalizedString>
250+
<LocalizedString ElementType="UxElement" StringId="divider_title">OR</LocalizedString>
251+
<LocalizedString ElementType="UxElement" StringId="createaccount_intro">Don't have an account?</LocalizedString>
252+
<LocalizedString ElementType="UxElement" StringId="unknown_error">We are having trouble signing you in. Please try again later.</LocalizedString>
253+
<!-- Uncomment the remember_me only if the keep me signed in is activated.
254+
<LocalizedString ElementType="UxElement" StringId="remember_me">Keep me signed in</LocalizedString> -->
255+
<LocalizedString ElementType="ClaimsProvider" StringId="FacebookExchange">Facebook</LocalizedString>
256+
<LocalizedString ElementType="ErrorMessage" StringId="ResourceOwnerFlowInvalidCredentials">Your password is incorrect.</LocalizedString>
257+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidPassword">Your password is incorrect.</LocalizedString>
258+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfPasswordExpired">Your password has expired.</LocalizedString>
259+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsPrincipalDoesNotExist">We can't seem to find your account.</LocalizedString>
260+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfOldPasswordUsed">Looks like you used an old password.</LocalizedString>
261+
<LocalizedString ElementType="ErrorMessage" StringId="DefaultMessage">Invalid username or password.</LocalizedString>
262+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfUserAccountDisabled">Your account has been locked. Contact your support person to unlock it, then try again.</LocalizedString>
263+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfUserAccountLocked">Your account is temporarily locked to prevent unauthorized use. Try again later.</LocalizedString>
264+
<LocalizedString ElementType="ErrorMessage" StringId="AADRequestsThrottled">There are too many requests at this moment. Please wait for some time and try again.</LocalizedString>
265+
</LocalizedStrings>
266+
</LocalizedResources>
265267
<!--Local account sign-up or sign-in page Spanish-->
266268
<LocalizedResources Id="api.signuporsignin.es">
267269
<LocalizedStrings>

‎articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ manager: martinco
1414
ms.reviewer: tilarso
1515

1616
ms.collection: M365-identity-device-management
17+
adobe-target: true
1718
---
1819
# Plan an Azure Active Directory self-service password reset deployment
1920

‎articles/active-directory/develop/quickstart-configure-app-expose-web-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: quickstart
1111
ms.workload: identity
12-
ms.date: 09/03/2020
12+
ms.date: 03/25/2022
1313
ms.author: marsma
1414
ms.custom: aaddev, contperf-fy21q1, mode-api
1515
ms.reviewer: aragra, lenalepa, sureshja
@@ -42,7 +42,7 @@ The code in a client application requests permission to perform operations defin
4242
First, follow these steps to create an example scope named `Employees.Read.All`:
4343

4444
1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
45-
1. If you have access to multiple tenants, use the **Directory + subscription** filter :::image type="icon" source="./media/quickstart-configure-app-expose-web-apis/portal-01-directory-subscription-filter.png" border="false"::: in the top menu to select the tenant containing your client app's registration.
45+
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="./media/quickstart-configure-app-expose-web-apis/portal-01-directory-subscription-filter.png" border="false"::: in the top menu to select the tenant containing your client app's registration.
4646
1. Select **Azure Active Directory** > **App registrations**, and then select your API's app registration.
4747
1. Select **Expose an API**
4848
1. Select **Set** next to **Application ID URI** if you haven't yet configured one.

‎articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ To support temporary passwords in Azure AD for synchronized users, you can enabl
136136

137137
> [!NOTE]
138138
> Forcing a user to change their password on next logon requires a password change at the same time. Azure AD Connect will not pick up the force password change flag by itself; it is supplemental to the detected password change that occurs during password hash sync.
139+
>
140+
> If the user has the option "Password never expires" set in Active Directory (AD), the force password change flag will not be set in Active Directory (AD), so the user will not be prompted to change the password during the next sign-in.
139141
140142
> [!CAUTION]
141143
> You should only use this feature when SSPR and Password Writeback are enabled on the tenant. This is so that if a user changes their password via SSPR, it will be synchronized to Active Directory.

‎articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ If you want all the latest features and updates, check this page and install wha
7777

7878
To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-to-connect-install-automatic-upgrade.md).
7979

80+
## 2.1.1.0
81+
82+
### Release status
83+
3/24/2022: Released for download only, not available for auto upgrade
84+
85+
86+
### Bug fixes
87+
- Fixed an issue where some sync rule functions were not parsing surrogate pairs properly.
88+
- Fixed an issue where, under certain circumstances, the sync service would not start due to a model db corruption.
89+
8090
## 2.0.91.0
8191

8292
### Release status

‎articles/active-directory/saas-apps/yellowbox-provisioning-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ The scenario outlined in this tutorial assumes that you already have the followi
3434

3535
* [An Azure AD tenant](../develop/quickstart-create-new-tenant.md).
3636
* A user account in Azure AD with [permission](../roles/permissions-reference.md) to configure provisioning (for example, Application Administrator, Cloud Application administrator, Application Owner, or Global Administrator).
37-
* A user account in Yellowbox with Admin rights.
37+
* A Yellowbox issued JSON Web Token for authorization against the SCIM provisioning endpoint
3838

3939
## Step 1. Plan your provisioning deployment
4040
1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
4141
1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
4242
1. Determine what data to [map between Azure AD and Yellowbox](../app-provisioning/customize-application-attributes.md).
4343

4444
## Step 2. Configure Yellowbox to support provisioning with Azure AD
45-
46-
Contact [Yellowbox Help desk](https://dashboard.yellowbox.app/#/help-desk) to obtain the SCIM Url and corresponding Token.
45+
* Use `https://australia-southeast1-yellowbox-f4c6e.cloudfunctions.net/scim` as the Tenant Url.
46+
* Obtain your JWT authorization Token from yellowbox by contacting [Yellowbox support](mailto:contact@yellowbox.app), if you haven't already been issued a token.
4747

4848
## Step 3. Add Yellowbox from the Azure AD application gallery
4949

‎articles/app-service/configure-language-python.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ms.date: 06/11/2021
66
ms.reviewer: astay; kraigb
77
ms.devlang: python
88
ms.custom: mvc, seodec18, devx-track-python, devx-track-azurecli, mode-other
9+
adobe-target: true
910
---
1011

1112
# Configure a Linux Python app for Azure App Service

‎articles/app-service/tutorial-java-spring-cosmosdb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Open the `pom.xml` file in the `initial/spring-boot-todo` directory and add the
183183
<plugin>
184184
<groupId>com.microsoft.azure</groupId>
185185
<artifactId>azure-webapp-maven-plugin</artifactId>
186-
<version>2.2.3</version>
186+
<version>2.5.0</version>
187187
<configuration>
188188
<schemaVersion>v2</schemaVersion>
189189
@@ -248,7 +248,7 @@ bash-3.2$ mvn azure-webapp:deploy
248248
[INFO] Building spring-todo-app 2.0-SNAPSHOT
249249
[INFO] ------------------------------------------------------------------------
250250
[INFO]
251-
[INFO] --- azure-webapp-maven-plugin:2.2.3:deploy (default-cli) @ spring-todo-app ---
251+
[INFO] --- azure-webapp-maven-plugin:2.5.0:deploy (default-cli) @ spring-todo-app ---
252252
Auth Type: AZURE_CLI
253253
Default subscription: xxxxxxxxx
254254
Username: xxxxxxxxx

0 commit comments

Comments
 (0)