resolve conflict

Author: mumian

articles/azure-monitor/alerts/itsmc-troubleshoot-overview.md

@@ -3,7 +3,7 @@ title: Troubleshoot problems in ITSMC
 description: Learn how to resolve common problems in IT Service Management Connector.  
 ms.author: abbyweisberg
 ms.topic: conceptual
-ms.date: 06/19/2023
+ms.date: 07/30/2024
 ms.reviewer: nolavime
 ---
 
@@ -110,5 +110,5 @@ The following sections identify common symptoms, possible causes, and resolution
 
 **Resolution**: 
 * Check if the alert is a log search alert. If it isn't a log search alert, configuration items are not supported.
-* If the search results don't have  a Computer or Resource column, add them to the query. When you're defining a query in Log Search alerts you need to have in the query result the Configuration items names with one of the label names "Computer",  "Resource", "_ResourceId" or "ResourceId”. This mapping enables to map the configuration items to the ITSM payload
+* If the search results don't have  a Computer or Resource column, add them to the query. When you're defining a query in Log Search alerts you need to have in the query result the Configuration items names with one of the label names "Computer",  "Resource", "_ResourceId" or "ResourceId”. This mapping enables mapping the configuration items to the ITSM payload
 * Check that the values in the Computer and Resource columns are identical to the values in the CMDB. If they aren't, add a new entry to the CMDB with the matching values.

articles/azure-resource-manager/bicep/bicep-core-diagnostics.md

@@ -38,4 +38,4 @@ output myString string = myValue
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp033.md

@@ -80,4 +80,4 @@ resource networkConnection 'Microsoft.Network/connections@2023-11-01' = {
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp035.md

@@ -50,4 +50,4 @@ param foo storageAccountConfigType = {
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp036.md

@@ -1,16 +1,16 @@
 ---
 title: BCP037
-description: Warning - The property <property-name> is not allowed on objects of type <type-definition>.
+description: Error/warning - The property <property-name> is not allowed on objects of type <type-definition>.
 ms.topic: reference
 ms.custom: devx-track-bicep
 ms.date: 07/15/2024
 ---
 
-# Bicep warning code - BCP037
+# Bicep error/warning code - BCP037
 
-This warning occurs when you specify a property that isn't defined in a resource type.
+This error/warning occurs when you specify a property that isn't defined in a resource type.
 
-## Warning description
+## Error/warning description
 
 `The property <property-name> is not allowed on objects of type <type-defintion>.`
 
@@ -82,4 +82,4 @@ param p obj = {
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp037.md

@@ -54,4 +54,4 @@ param foo storageAccountConfigType = {
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp040.md

@@ -56,4 +56,4 @@ output foo string = storage.name
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp053.md

@@ -39,4 +39,4 @@ output outValue string = foo
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).

articles/azure-resource-manager/bicep/diagnostics/bcp072.md

@@ -1,16 +1,16 @@
 ---
 title: BCP073
-description: Warning - The property <property-name> is read-only. Expressions cannot be assigned to read-only properties.
+description: Error/warning - The property <property-name> is read-only. Expressions cannot be assigned to read-only properties.
 ms.topic: reference
 ms.custom: devx-track-bicep
 ms.date: 07/15/2024
 ---
 
-# Bicep warning code - BCP073
+# Bicep error/warning code - BCP073
 
-This warning occurs when you assign a value to a read-only property.
+This error/warning occurs when you assign a value to a read-only property.
 
-## Warning description
+## Error/warning description
 
 `The property <property-name> is read-only. Expressions cannot be assigned to read-only properties.`
 
@@ -63,4 +63,4 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2023-04-01'
 
 ## Next steps
 
-For more information about Bicep error and warning codes, see [Bicep warnings and errors](../bicep-core-diagnostics.md).
+For more information about Bicep error and warning codes, see [Bicep core diagnostics](../bicep-core-diagnostics.md).