MergeConflictFix

Author: MicrosoftGuyJFlo

articles/active-directory/authentication/concept-authentication-default-enablement.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 09/13/2023
+ms.date: 09/15/2023
 
 ms.author: justinha
 author: mjsantani
@@ -55,7 +55,7 @@ The following table lists each setting that can be set to Microsoft managed and
 
 | Setting                                                                                         | Configuration |
 |-------------------------------------------------------------------------------------------------|---------------|
-| [Registration campaign](how-to-mfa-registration-campaign.md)                                    | Beginning in July, 2023, enabled for text message and voice call users with free and trial subscriptions.      |
+| [Registration campaign](how-to-mfa-registration-campaign.md)                                    | From Sept 25 to Oct 20, 2023, the Microsoft managed value for the registration campaign will change to Enabled for text message and voice call users across all tenants. |
 | [Location in Microsoft Authenticator notifications](how-to-mfa-additional-context.md)           | Disabled      |
 | [Application name in Microsoft Authenticator notifications](how-to-mfa-additional-context.md)   | Disabled      |
 | [System-preferred MFA](concept-system-preferred-multifactor-authentication.md)                  | Enabled       |

articles/active-directory/authentication/how-to-mfa-registration-campaign.md

@@ -1,13 +1,13 @@
 ---
-title: Nudge users to set up Microsoft Authenticator
+title: How to run a registration campaign to set up Microsoft Authenticator
 description: Learn how to move your organization away from less secure authentication methods to Microsoft Authenticator
 
 services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.custom: ignite-2022
 ms.topic: conceptual
-ms.date: 09/13/2023
+ms.date: 09/15/2023
 
 ms.author: justinha
 author: mjsantani

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 11/21/2022
+ms.date: 09/13/2023
 ms.author: jeedes
 ---
 
@@ -83,7 +83,7 @@ Follow these steps to enable Azure AD SSO.
 
 1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section,  find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
 
-	![The Certificate download link](common/metadataxml.png)
+	![Screenshot of The Certificate download link.](common/metadataxml.png)
 
 1. On the **Set up Britive** section, copy the appropriate URL(s) based on your requirement.
 
@@ -117,37 +117,35 @@ In this section, you'll enable B.Simon to use single sign-on by granting access
 
 ## Configure Britive SSO
 
-1. In a different web browser window, sign into Britive website as an administrator.
+1. Log in to the Britive application with administrator privileges in a different web browser window.
 
-1. Click on **Admin Settings Icon** and select **Security**.
+1. Select **Admin->Identity Management->Identity Providers** from the navigation menu.
 
-    ![Screenshot shows the Britive website with Settings and Security selected.](./media/britive-tutorial/security.png)
+1. Select **ADD IDENTITY PROVIDER**. Enter the name and description. Select the **Add** button.
 
-1. Select **SSO Configuration** and perform the following steps:
+    ![Screenshot of Add Identity Provider.](./media/britive-tutorial/security.png)
 
-    ![Screenshot shows S S O Configuration where you enter the information in this step.](./media/britive-tutorial/configuration.png)
+1. Select **Manage** for the Azure identity provider and select **SSO Configuration**.
+   
+   ![Screenshot of SSO Configuration Settings.](./media/britive-tutorial/configuration.png)
 
-    a. Copy **Audience/Entity ID** value and paste it into the **Identifier (Entity ID)** text box in the **Basic SAML Configuration** section.
+   1. Copy **Audience/Entity ID** value and paste it into the **Identifier (Entity ID)** text box in the **Basic SAML Configuration** section.
+   1. Copy **Initiate SSO URL** value and paste it into the **Sign on URL** text box in the **Basic SAML Configuration** section.
+   1. Change the **SSO Provider** from **Generic** to **Azure**.
+   1. Copy the **Audience/Entity ID** value and paste it into the Identifier (Entity ID) text box in the Basic SAML Configuration section in the Azure portal.
+   1. Copy the **Initiate SSO URL** value and paste it into the Sign on URL text box in the Basic SAML Configuration section in the Azure portal.
+   1. Select **UPLOAD SAML METADATA** to upload the downloaded **metadata XML** file from the Azure portal. After uploading the metadata file the above values will be auto- populated and save changes.
 
-    b. Copy **Initiate SSO URL** value and paste it into the **Sign on URL** text box in the **Basic SAML Configuration** section.
-
-    c. Click on **UPLOAD SAML METADATA** to upload the downloaded metadata XML file from Azure portal. After uploading the metadata file the above values will be auto populated and save changes.
 
 ### Create Britive test user
 
-1. In a different web browser window, sign into Britive website as an administrator.
-
-1. Click on **Admin Settings Icon** and select **User Administration**.
-
-    ![Screenshot shows the Britive website with Settings and User Administration selected.](./media/britive-tutorial/user.png)
-
-1. Click on **ADD USER**.
+1. Log in to the Britive with administrator privileges in a different web browser window.
 
-    ![Screenshot shows the ADD USER button.](./media/britive-tutorial/add-user.png)
+2. Select **Admin** Settings Icon and select **Identity Management**.
 
-1. Fill all the necessary details of the user according your organization requirement and click **ADD USER**.
+3. Select **ADD USER** from the **Users** tab.
 
-    ![Screenshot shows the Ad a User page where you enter user information.](./media/britive-tutorial/user-fields.png)
+4. Fill in all the necessary details of the user according to your organization's requirements and select **Add**. Make sure to select Azure from the **Identity Providers** list.
 
 > [!NOTE]
 >Britive also supports automatic user provisioning, you can find more details [here](./britive-provisioning-tutorial.md) on how to configure automatic user provisioning.
@@ -156,7 +154,11 @@ In this section, you'll enable B.Simon to use single sign-on by granting access
 
 In this section, you test your Azure AD single sign-on configuration with following options. 
 
+<<<<<<< HEAD
 * Click on **Test this application**, this will redirect to Britive Sign-on URL where you can initiate the login flow. 
+=======
+* Select **Test this application** in Azure portal. This will redirect to Britive Sign-on URL where you can initiate the login flow. 
+>>>>>>> 583f4d6daf031cd65c4656b3dbd804824ebb0258
 
 * Go to Britive Sign-on URL directly and initiate the login flow from there.
 

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

@@ -1,7 +1,7 @@
 ---
 title: Azure Policy Regulatory Compliance controls for Azure AI services
 description: Lists Azure Policy Regulatory Compliance controls available for Azure AI services. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
-ms.date: 09/14/2023
+ms.date: 09/19/2023
 ms.topic: sample
 author: PatrickFarley
 ms.author: pafarley

articles/active-directory/saas-apps/media/britive-tutorial/security.png

@@ -7,7 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: translator-text
 ms.topic: quickstart
-ms.date: 07/18/2023
+ms.date: 09/19/2023
 ms.author: lajanuar
 ms.custom: references_regions, build-2023
 recommendations: false
@@ -16,7 +16,10 @@ recommendations: false
 # Document Translation in Language Studio (Preview)
 
 > [!IMPORTANT]
-> Document Translation in Language Studio is currently in Public Preview. Features, approaches and processes may change, prior to General Availability (GA), based on user feedback.
+>
+> * Document Translation in Language Studio is currently in Public Preview. Features, approaches and processes may change, prior to General Availability (GA), based on user feedback.
+>
+> * Currently, virtual network connectivity isn't supported for the Document Translation feature in the Language Studio.
 
  Document Translation in [**Azure AI Language Studio**](https://language.cognitive.azure.com/home) is a no-code user interface that lets you interactively translate documents from local or Azure Blob Storage.
 

articles/ai-services/security-controls-policy.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Policy Regulatory Compliance controls for Azure Kubernetes Service (AKS)
 description: Lists Azure Policy Regulatory Compliance controls available for Azure Kubernetes Service (AKS). These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
-ms.date: 09/14/2023
+ms.date: 09/19/2023
 ms.topic: sample
 ms.custom: subject-policy-compliancecontrols
 ---

articles/ai-services/translator/document-translation/language-studio.md

@@ -19,4 +19,12 @@
 - name: Reference
   items:
       - name: REST API
-        href: https://aka.ms/apicenter/docs/rest
+        href: /rest/api/apicenter/
+      - name: REST API SDKs
+        items:
+          - name: JavaScript
+            href: /javascript/api/overview/azure/apicenter
+          - name: Java
+            href: /java/api/overview/azure/apicenter
+          - name: Python
+            href: https://pypi.org/project/azure-mgmt-apicenter

articles/aks/security-controls-policy.md

@@ -6,48 +6,59 @@ editor: ''
 
 ms.service: api-center
 ms.topic: conceptual
-ms.date: 06/05/2023
+ms.date: 08/18/2023
 ms.author: danlep
 ms.custom: 
 ---
 
 # Azure API Center (preview) - key concepts
 
-This article goes into more detail about key concepts of [Azure API Center](overview.md). API Center enables tracking APIs in a centralized location for discovery, reuse, and governance.
+This article explains key concepts of [Azure API Center](overview.md). API Center enables tracking APIs in a centralized location for discovery, reuse, and governance.
 
 [!INCLUDE [api-center-preview-feedback](includes/api-center-preview-feedback.md)]
 
+## Data model
+
+The following diagram shows the main entities in API Center and how they relate to each other. See the following sections for more information about each entity.
+
+:::image type="content" source="media/key-concepts/api-center-data-model.png" alt-text="Diagram that shows the data model in API Center." border="false":::
+
+### Highlighted relationships
+
+1. Each **API** can have multiple **versions** and multiple real-world **deployments**.
+1. Each API **version** can have multiple API **definitions**.
+1. Each API **deployment** is associated with a specific **environment** and a specific API **definition** file.
+
 ## API
 
-A top-level logical entity in API Center that represents any real-world API. API Center supports APIs of any type, including REST, GraphQL, gRPC, SOAP, WebSocket, and Webhook.
+A top-level logical entity in API Center, an API represents any real-world API that you want to track. API Center supports APIs of any type, including REST, GraphQL, gRPC, SOAP, WebSocket, and Webhook.
 
 An API can be managed by any API management solution (such as Azure [API Management](../api-management/api-management-key-concepts.md) or solutions from other providers), or unmanaged.
 
-## API version
+## Environment
 
-APIs typically have multiple versions across lifecycle stages. In API Center, associate one or more versions with each API, aligned with specific API changes. Some versions may introduce major or breaking changes, while others add minor improvements. An API version can be at any lifecycle stage – from design, to preview, production, or deprecated. 
+In API Center, an environment represents a location where an API runtime could be deployed, typically an API management platform, API gateway, or compute service. Each environment has a type (such as production or staging) and may include information about developer portal or management interfaces.
 
-Each API version may be defined with a specification file, such as an OpenAPI definition for a REST API. API Center allows any specification file formatted as text (YAML, JSON, markdown, and so on). You can upload OpenAPI, gRPC, GraphQL, AsyncAPI, WSDL, and WADL specifications, among others.
+## API version
 
-## Environment
+An API can have multiple versions across lifecycle stages, each aligned with specific API changes. Some versions may introduce major or breaking changes, while others add minor improvements. An API version can be at any lifecycle stage – from design, to preview, production, or deprecated. 
 
-Use API Center to maintain information about your APIs' environments. An environment represents a location where an API runtime could be deployed, typically an API management platform, API gateway, or compute service. Each environment has a type (such as production or staging) and may include information about developer portal or management interfaces.
+## API definition
+
+Each API version may be defined with one or more definition files, such as an OpenAPI definition for a REST API. API Center allows any API definition file formatted as text (YAML, JSON, Markdown, and so on). You can upload OpenAPI, gRPC, GraphQL, AsyncAPI, WSDL, and WADL definitions, among others. API Center also supports importing API definitions from a URL.
 
 ## Deployment
 
-In API Center, a deployment identifies a specific environment used for the runtime of an API version. For example, an API version could have two deployments: a deployment in a staging Azure API Management service and a deployment in a production Azure API Management service.
+In API Center, a deployment identifies a specific environment used for an API runtime. An API could have multiple deployments, for example, one deployment in a staging Azure API Management service and a second deployment in a production Azure API Management service. Each deployment is associated with a specific API definition.
 
-## Metadata and metadata schema
+## Metadata properties
 
-In API Center, you organize your APIs and other assets by setting values of metadata properties, which can be used for searching and filtering and to enforce governance standards. API Center provides several common built-in properties such as "API type" and "Lifecycle". An API Center owner can augment the built-in properties by defining custom properties in a metadata schema to organize their APIs, deployments, and environments according to their organization's requirements. For example, create a *Line of business* property to identify the business unit that owns an API. 
+In API Center, you organize your APIs, deployments, and other entities by setting values of metadata properties, which can be used for searching and filtering and to enforce governance standards. API Center provides several common built-in properties such as "API type" and "Version lifecycle". An API Center owner can augment the built-in properties by defining custom properties in a metadata schema to organize their APIs, deployments, and environments according to their organization's requirements. For example, create a *Line of business* property to identify the business unit that owns an API. 
 
 API Center supports properties of type array, boolean, number, object, predefined choices, and string. 
 
 API Center's metadata schema is compatible with JSON and YAML schema specifications, to allow for schema validation in developer tooling and automated pipelines.
 
-## Workspace
-
-To enable multiple teams to work independently in a single deployment, API Center provides workspaces. Similar to API Management [workspaces](../api-management/workspaces-overview.md), workspaces in API Center allow separate teams to access and manage a part of the API inventory. Access is controlled through Azure role-based access control (RBAC).
 
 ## Next steps