Merge branch 'main' of github.com:MicrosoftDocs/azure-docs-pr into image-versions

Author: Larry Franks

.openpublishing.redirection.json

@@ -798,6 +798,16 @@
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/dapr-troubleshooting.md",
+            "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/csi-secrets-store-troubleshooting.md",
+            "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cdn/index.yml",
             "redirect_url": "/azure/frontdoor",

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 10/10/2022
+ms.date: 11/04/2022
 ms.author: jeedes
 
 ---
@@ -27,7 +27,7 @@ In this tutorial, you'll learn how to integrate Contentkalender with Azure Activ
 To get started, you need the following items:
 
 * An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
-* Contentkalender single sign-on (SSO) enabled subscription.
+* Contentkalender single sign-on (SSO) enabled subscription (contact Contentkalender [customer service](mailto:[email protected])).
 * Along with Cloud Application Administrator, Application Administrator can also add or manage applications in Azure AD.
 For more information, see [Azure built-in roles](../roles/permissions-reference.md).
 
@@ -84,19 +84,17 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
    | **Identifier** |
    |------------|
    | `https://login.contentkalender.nl` |
-   | `https://login.decontentkalender.be` |
-   | `https://contentkalender-acc.bettywebblocks.com/` |
+   | `https://contentkalender-acc.bettywebblocks.com/` (only for testing purposes)|
 
    b. In the **Reply URL** text box, type one of the following URLs:
 
    | **Reply URL** |
    |-----------|
    | `https://login.contentkalender.nl/sso/saml/callback` |
-   | `https://login.decontentkalender.be/sso/saml/callback` |
-   | `https://contentkalender-acc.bettywebblocks.com/sso/saml/callback` |
+   | `https://contentkalender-acc.bettywebblocks.com/sso/saml/callback` (only for testing purposes)|
 
    c. In the **Sign-on URL** text box, type the URL:
-   `https://contentkalender-acc.bettywebblocks.com/v2/login`
+   `https://login.contentkalender.nl/v2/login`
 
 1. Your Contentkalender application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows an example for this. The default value of **Unique User Identifier** is **user.userprincipalname** but Contentkalender expects this to be mapped with the user's email address. For that you can use **user.mail** attribute from the list or use the appropriate attribute value based on your organization configuration.
 

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 06/21/2022
+ms.date: 11/04/2022
 ms.author: jeedes
 ---
 # Tutorial: Azure AD SSO integration with iQualify LMS
@@ -108,7 +108,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
     | Name | Source Attribute|
     | --- | --- |
-    | email | user.userprincipalname |
+    | email | user.mail |
     | first_name | user.givenname |
     | last_name | user.surname |
     | person_id | "your attribute" |

articles/active-directory/saas-apps/media/timetabling-solutions-tutorial/timetabling-configuration.png

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 06/14/2022
+ms.date: 11/04/2022
 ms.author: jeedes
 
 ---
@@ -118,7 +118,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Tendium SSO
 
-To configure single sign-on on **Tendium** side, you need to send the **App Federation Metadata Url** to [Tendium support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+To configure single sign-on on **Tendium** side, you need to send the **App Federation Metadata Url** to [Tendium support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.You can also contact Tendium [here](https://tendium.ai/contact/) for more information.
 
 ### Create Tendium test user
 

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 06/16/2022
+ms.date: 06/04/2022
 ms.author: jeedes
 ---
 
@@ -50,8 +50,6 @@ To configure the integration of Timetabling Solutions into Azure AD, you need to
 1. In the **Add from the gallery** section, type **Timetabling Solutions** in the search box.
 1. Select **Timetabling Solutions** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
 
- Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. [Learn more about Microsoft 365 wizards.](/microsoft-365/admin/misc/azure-ad-setup-guides)
-
 ## Configure and test Azure AD SSO for Timetabling Solutions
 
 Configure and test Azure AD SSO with Timetabling Solutions using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Timetabling Solutions.
@@ -118,11 +116,38 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Timetabling Solutions SSO
 
-To configure single sign-on on **Timetabling Solutions** side, you need to send the **Thumbprint Value** and appropriate copied URLs from Azure portal to [Timetabling Solutions support team](https://www.timetabling.com.au/contact-us/). They set this setting to have the SAML SSO connection set properly on both sides.
+In this section, you'll populate the relevant SSO values in the Timetabling Solutions Administration Console.
+
+1. In the [Administration Console](https://admin.timetabling.education/), select **5 Settings**, and then select the **SAML SSO** tab.
+1. Perform the following steps in the **SAML SSO** section:
+ 
+    ![Screenshot for SSO settings.](./media/timetabling-solutions-tutorial/timetabling-configuration.png)
+
+    a. Enable SAML Integration.
+
+    b. In the **SAML Login Path** textbox, paste the **Login URL** value, which you have copied from the Azure portal.
+
+    c. In the **SAML Logout Path** textbox, paste the **Logout URL** value, which you have copied from the Azure portal.
+
+    d. In the **SAML Certificate Fingerprint** textbox, paste the **Thumbprint Value**, which you have copied from the Azure portal.
 
-### Create Timetabling Solutions test user
+    e. Enter the **Custom Domain** name.
+    
+    f. **Save** the settings. 
 
-In this section, you create a user called Britta Simon in Timetabling Solutions. Work with [Timetabling Solutions support team](https://www.timetabling.com.au/contact-us/) to add the users in the Timetabling Solutions platform. Users must be created and activated before you use single sign-on.
+
+## Create Timetabling Solutions test user
+
+In this section, you create a user called Britta Simon in the Timetabling Solutions Administration Console. 
+
+1. In the [Administration Console](https://admin.timetabling.education/), select **1 Manage Users**, and click **Add**.
+2. Enter the mandatory fields **First Name**, **Family Name** and **Email Address**. Add other appropriate values in the non-mandatory fields.
+3. Ensure **Online** is active in Status.
+4. Click **Save and Next**.
+
+
+> [!NOTE]
+> Work with [Timetabling Solutions support team](https://www.timetabling.com.au/contact-us/) to add the users in the Timetabling Solutions platform. Users must be created and activated before you use single sign-on.
 
 ## Test SSO 
 

articles/active-directory/saas-apps/timetabling-solutions-tutorial.md

@@ -1,9 +1,9 @@
 ---
 title: Restore deleted apps
 description: Learn how to restore a deleted app in Azure App Service. Avoid the headache of an accidentally deleted app.
-author: btardif
-ms.author: byvinyal
-ms.date: 9/23/2019
+author: seligj95
+ms.author: jordanselig
+ms.date: 11/4/2022
 ms.topic: article 
 ms.custom: devx-track-azurepowershell
 ---

articles/aks/csi-secrets-store-troubleshooting.md

@@ -5,6 +5,6 @@ ms.topic: include
 ms.date: 02/03/2022
 ---
 
-   1. On the left navigation, select **Firewalls and virtual networks**.
-   1. In the Firewall Rules section, enter a new **Rule name** of 'MyLocalAccess'.  In the **Start IP** and **End IP** fields, paste the IP Address you copied earlier.
+   1. On the left navigation, select **Networking**.
+   1. On the **Public access** tab, select **Add your client IPv4 address (xx.xx.xx.xx)** to add a firewall rule that will allow your local computer to access the database.
    1. Select **Save** at the top of the screen to persist your changes.