Merge pull request #235842 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 6d7a3a3cc9c9 · 2023-04-26T09:55:44.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/fundamentals/customize-branding.md b/articles/active-directory/fundamentals/customize-branding.md
@@ -32,6 +32,8 @@ Adding custom branding requires one of the following licenses:
 - Azure AD Premium 2
 - Office 365 (for Office apps)
 
+At least one of the previously listed licenses is sufficient to add and manage the company branding in your tenant.
+
 Azure AD Premium editions are available for customers in China using the worldwide instance of Azure AD. Azure AD Premium editions aren't currently supported in the Azure service operated by 21Vianet in China. For more information about licensing and editions, see [Sign up for Azure AD Premium](active-directory-get-started-premium.md).
 
 The **Global Administrator** role is required to customize company branding.
diff --git a/articles/applied-ai-services/metrics-advisor/faq.yml b/articles/applied-ai-services/metrics-advisor/faq.yml
@@ -66,6 +66,7 @@ sections:
           
           | Granularity(min) |	Retention(day) |
           |------------------| ------------------|
+          | 1 | 6.94 |
           |  5 | 34.72|
           | 15 | 104.1|
           | 60(=hourly) | 416.67 |
diff --git a/articles/applied-ai-services/metrics-advisor/how-tos/onboard-your-data.md b/articles/applied-ai-services/metrics-advisor/how-tos/onboard-your-data.md
@@ -48,7 +48,7 @@ After signing into your Metrics Advisor portal and choosing your workspace, clic
 #### 1. Basic settings
 Next you'll input a set of parameters to connect your time-series data source. 
 * **Source Type**: The type of data source where your time series data is stored.
-* **Granularity**: The interval between consecutive data points in your time series data. Currently Metrics Advisor supports: Yearly, Monthly, Weekly, Daily, Hourly, and Custom. The lowest interval the customization option supports is 300 seconds.
+* **Granularity**: The interval between consecutive data points in your time series data. Currently Metrics Advisor supports: Yearly, Monthly, Weekly, Daily, Hourly, per minute, and Custom. The lowest interval the customization option supports is 60 seconds.
   * **Seconds**: The number of seconds when *granularityName* is set to *Customize*.
 * **Ingest data since (UTC)**: The baseline start time for data ingestion. `startOffsetInSeconds` is often used to add an offset to help with data consistency.
 
diff --git a/articles/azure-maps/tutorial-search-location.md b/articles/azure-maps/tutorial-search-location.md
@@ -279,6 +279,6 @@ The next tutorial demonstrates how to display a route between two locations.
 [MapControlCredential]: /javascript/api/azure-maps-rest/atlas.service.mapcontrolcredential
 [pipeline]: /javascript/api/azure-maps-rest/atlas.service.pipeline
 [searchURL]: /javascript/api/azure-maps-rest/atlas.service.searchurl
-[Search API] /rest/api/maps/search
+[Search API]: /rest/api/maps/search
 [Fuzzy Search service]: /rest/api/maps/search/get-search-fuzzy
 [setCamera]: /javascript/api/azure-maps-control/atlas.map#setcamera-cameraoptions---cameraboundsoptions---animationoptions-
diff --git a/articles/azure-resource-manager/bicep/linter.md b/articles/azure-resource-manager/bicep/linter.md
@@ -35,7 +35,6 @@ The default set of linter rules is minimal and taken from [arm-ttk test cases](.
 - [outputs-should-not-contain-secrets](./linter-rule-outputs-should-not-contain-secrets.md)
 - [prefer-interpolation](./linter-rule-prefer-interpolation.md)
 - [prefer-unquoted-property-names](./linter-rule-prefer-unquoted-property-names.md)
-- [protect-commandtoexecute-secrets](./linter-rule-protect-commandtoexecute-secrets.md)
 - [secure-parameter-default](./linter-rule-secure-parameter-default.md)
 - [secure-params-in-nested-deploy](./linter-rule-secure-params-in-nested-deploy.md)
 - [secure-secrets-in-params](./linter-rule-secure-secrets-in-parameters.md)
diff --git a/articles/azure-vmware/vmware-hcx-mon-guidance.md b/articles/azure-vmware/vmware-hcx-mon-guidance.md
@@ -24,7 +24,7 @@ ms.date: 3/24/2023
 
 [HCX Mobility Optimized Networking (MON)](https://docs.vmware.com/en/VMware-HCX/4.2/hcx-user-guide/GUID-0E254D74-60A9-479C-825D-F373C41F40BC.html) is an optional feature to enable when using [HCX Network Extensions (NE)](configure-hcx-network-extension.md). MON provides optimal traffic routing under certain scenarios to prevent network tromboning between the on-premises and cloud-based resources on extended networks. 
 
-As MON is an enterprise capability of the NE feature, make sure you've enabled the [VMware HCX Enterprise](https://cloud.vmware.com/community/2019/08/08/introducing-hcx-enterprise/) add-on through a [support request](https://portal.azure.com/#create/Microsoft.Support). 
+As MON is an enterprise capability of the NE feature, make sure you've [enabled the VMware HCX Enterprise](/azure/azure-vmware/install-vmware-hcx#hcx-license-edition) through the Azure portal. 
 
 Throughout the migration cycle, MON optimizes application mobility for:
 
diff --git a/articles/communication-services/concepts/interop/guest/capabilities.md b/articles/communication-services/concepts/interop/guest/capabilities.md
@@ -25,6 +25,7 @@ In this article, you will learn which capabilities are supported for Teams exter
 |                   | Prevent joining locked meeting                                                                                      | ✔️        |
 |                   | Honor assigned Teams meeting role                                                                                   |   ✔️      |
 | Chat              | Send and receive chat messages                                                                                      | ✔️ |
+|                   | [Receive inline images](../../../tutorials/chat-interop/meeting-interop-features-inline-image.md)                                                                    | ✔️** |
 |                   | Send and receive Giphy                                                                                              | ❌ |
 |                   | Send messages with high priority                                                                                    | ❌ |
 |                   | Receive messages with high priority                                                                                 | ✔️ |
@@ -39,12 +40,6 @@ In this article, you will learn which capabilities are supported for Teams exter
 |                   | React to chat message                                                                                               | ❌ |
 |                   | [Data Loss Prevention (DLP)](/microsoft-365/compliance/dlp-microsoft-teams)                                         | ✔️*|
 |                   | [Customer Managed Keys (CMK)](/microsoft-365/compliance/customer-key-overview)                                      | ✔️ |
-| Chat with Teams Interoperability              | Send and receive text messages                                                                    | ✔️ | 
-|                   | Send and receive rich text messages                                                                    | ✔️ | 
-|                   | Send and receive typing indicators                                                                                                |  ✔️ |
-|                   | [Receive inline images](../../../tutorials/chat-interop/meeting-interop-features-inline-image.md)                                                                    | ✔️** |
-|                   | Receive read receipts                                                                                                |  ❌ |
-|                   | Receive shared files                                                                                                |  ❌ |
 | Mid call control  | Turn your video on/off                                                                                              | ✔️        |
 |                   | Mute/Unmute mic                                                                                                     | ✔️        |
 |                   | Switch between cameras                                                                                              | ✔️        |
@@ -174,7 +169,12 @@ When Teams external users leave the meeting, or the meeting ends, they can no lo
 
 *Azure Communication Services provides developers tools to integrate Microsoft Teams Data Loss Prevention that is compatible with Microsoft Teams. For more information, go to [how to implement Data Loss Prevention (DLP)](../../../how-tos/chat-sdk/data-loss-prevention.md)
 
-**Inline images are images that are copied and pasted directly into the send box of Teams client. For images that were uploaded via "Upload from this device" menu or via drag-and-drop (such as dragging images directly to the send box) in the Teams, they are not supported at this moment. To copy an image, the Teams user can either use their operating system's context menu to copy the image file then paste it into the send box of their Teams client, or use keyboard shortcuts instead.
+**Microsoft Teams allows users to share images by:
+- Copying & paste into the box at the bottom of the chat - inline images.
+- Drag & drop into the chat area.
+- Upload an image as a file via the "Upload from this device" button.
+
+Azure Communication Services currently support only option one for copying and pasting the image. Users can achieve it using keyboard shortcuts or the operating system's context menu options for copy and paste.
 
 **Inline image support is currently in public preview and is available in the Chat SDK for JavaScript only. Preview APIs and SDKs are provided without a service-level agreement. We recommend that you don't use them for production workloads. Some features might not be supported, or they might have constrained capabilities. For more information, review [Supplemental Terms of Use for Microsoft Azure Previews.](https://azure.microsoft.com/support/legal/preview-supplemental-terms/)
 
