Skip to content

Commit 2f7583b

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents bf66e12 + 14d3a4d commit 2f7583b

File tree

224 files changed

+4483
-9437
lines changed

Some content is hidden

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

224 files changed

+4483
-9437
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@
188188
"branch": "master",
189189
"branch_mapping": {}
190190
},
191+
{
192+
"path_to_root": "new_powershell_scripts",
193+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
194+
"branch": "main",
195+
"branch_mapping": {}
196+
},
191197
{
192198
"path_to_root": "policy-templates",
193199
"url": "https://github.com/Azure/azure-policy",

.openpublishing.redirection.azure-monitor.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6433,6 +6433,21 @@
64336433
"source_path_from_root": "/articles/azure-monitor/faq.yml",
64346434
"redirect_url": "/azure/azure-monitor/overview#frequently-asked-questions",
64356435
"redirect_document_id": false
6436+
},
6437+
{
6438+
"source_path_from_root": "/articles/azure-monitor/logs/app-expression.md",
6439+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6440+
"redirect_document_id": false
6441+
},
6442+
{
6443+
"source_path_from_root": "/articles/azure-monitor/logs/workspace-expression.md",
6444+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6445+
"redirect_document_id": false
6446+
},
6447+
{
6448+
"source_path_from_root": "/articles/azure-monitor/logs/resource-expression.md",
6449+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6450+
"redirect_document_id": false
64366451
}
64376452
]
64386453
}

.openpublishing.redirection.sentinel.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,11 @@
479479
"source_path": "articles/sentinel/data-connectors/deprecated-cisco-firepower-estreamer-via-legacy-agent.md",
480480
"redirect_url": "/azure/sentinel/data-connectors/cisco-firepower-estreamer",
481481
"redirect_document_id": true
482-
}
482+
},
483+
{
484+
"source_path": "articles/sentinel/data-connectors/cyberpion-security-logs.md",
485+
"redirect_url": "/azure/sentinel/data-connectors-reference",
486+
"redirect_document_id": false
487+
}
483488
]
484489
}

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99

1010
ms.topic: reference
11-
ms.date: 04/19/2022
11+
ms.date: 11/14/2023
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -615,7 +615,8 @@ The following IDs are used for claims transformations error messages:
615615
| `DateTimeGreaterThan` |[AssertDateTimeIsGreaterThan](date-transformations.md#assertdatetimeisgreaterthan) | Claim value comparison failed: The provided left operand is greater than the right operand.|
616616
| `UserMessageIfClaimsTransformationStringsAreNotEqual` |[AssertStringClaimsAreEqual](string-transformations.md#assertstringclaimsareequal) | Claim value comparison failed using StringComparison "OrdinalIgnoreCase".|
617617

618-
### Claims transformations example
618+
### Claims transformations example 1:
619+
This example shows localized messages for local account signup.
619620

620621
```xml
621622
<LocalizedResources Id="api.localaccountsignup.en">
@@ -627,6 +628,17 @@ The following IDs are used for claims transformations error messages:
627628
</LocalizedResources>
628629
```
629630

631+
### Claims transformations example 2:
632+
This example shows localized messages for local account password reset.
633+
634+
```xml
635+
<LocalizedResources Id="api.localaccountpasswordreset.en">
636+
<LocalizedStrings>
637+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsTransformationBooleanValueIsNotEqual">You cannot use the old password</LocalizedString>
638+
</LocalizedStrings>
639+
</LocalizedResources>
640+
```
641+
630642
## Next steps
631643

632644
See the following articles for localization examples:

articles/advisor/advisor-cost-recommendations.md

Lines changed: 79 additions & 44 deletions
Large diffs are not rendered by default.

articles/advisor/advisor-get-started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: mabrahms
55
ms.author: v-mabrahms
66
ms.service: azure
77
ms.topic: article
8-
ms.date: 09/16/2023
8+
ms.date: 12/1/2023
99

1010
---
1111

@@ -88,9 +88,9 @@ From any Azure Advisor page, click **Configuration** in the left navigation pane
8888

8989
* **Resources**: Uncheck any subscriptions you don't want to receive Advisor recommendations for, click **Apply**. The page refreshes.
9090

91-
* **VM/VMSS right sizing**: You can adjust the average CPU utilization rule and the look back period on a per-subscription basis. Doing virtual machine (VM) right sizing requires specialized knowledge.
91+
* **VM/VMSS right sizing**: You can adjust Advisor virtual machine (VM) and virtual machine scale sets (VMSS) recommendations. Specifically, you can setup a filter for each subscription to only show recommendations for machines with certain CPU utilization. This setting will filter recommendations but will not change how they are generated.
9292

93-
1. Select the subscriptions you’d like to adjust the average CPU utilization rule for, and then click **Edit**. Not all subscriptions can be edited for VM/VMSS right sizing and certain privileges are required; for more information on permissions, see [Permissions in Azure Advisor](permissions.md).
93+
1. Select the subscriptions you’d like to setup a filter for average CPU utilization, and then click **Edit**. Not all subscriptions can be edited for VM/VMSS right sizing and certain privileges are required; for more information on permissions, see [Permissions in Azure Advisor](permissions.md).
9494

9595
1. Select the desired average CPU utilization value and click **Apply**. It can take up to 24 hours for the new settings to be reflected in recommendations.
9696

articles/ai-services/openai/how-to/switching-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ client = AzureOpenAI(
5252
api_key=os.getenv("AZURE_OPENAI_KEY"),
5353
api_version="2023-10-01-preview",
5454
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
55-
)
55+
)
5656
```
5757

5858
</td>

articles/ai-services/speech-service/includes/language-support/pronunciation-assessment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ms.author: eur
2626
|Malay (Malaysia)|`ms-MY`|
2727
|Norwegian Bokmål (Norway)|`nb-NO`|
2828
|Portuguese (Brazil)|`pt-BR`|
29-
|Russian (Russia)|`ru-RU`<sup>1</sup>|
29+
|Russian (Russia)|`ru-RU`|
3030
|Spanish (Mexico)|`es-MX` |
3131
|Spanish (Spain)|`es-ES` |
3232
|Swedish (Sweden)|`sv-SE`<sup>1</sup>|

articles/ai-services/speech-service/regions.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following regions are supported for Speech service features such as speech t
4444
| Europe | France Central | `francecentral` |
4545
| Europe | Germany West Central | `germanywestcentral` |
4646
| Europe | Norway East | `norwayeast` |
47-
| Europe | Sweden Central | `swedentcentral` |
47+
| Europe | Sweden Central | `swedentcentral`<sup>8</sup> |
4848
| Europe | Switzerland North | `switzerlandnorth` <sup>6</sup>|
4949
| Europe | Switzerland West | `switzerlandwest` |
5050
| Europe | UK South | `uksouth` <sup>1,2,3,4,7</sup>|
@@ -70,10 +70,12 @@ The following regions are supported for Speech service features such as speech t
7070

7171
<sup>5</sup> The region supports keyword verification.
7272

73-
<sup>6</sup> The region does not support Speaker Recognition.
73+
<sup>6</sup> The region doesn't support Speaker Recognition.
7474

7575
<sup>7</sup> The region supports the [high performance](how-to-deploy-and-use-endpoint.md#add-a-deployment-endpoint) endpoint type for Custom Neural Voice.
7676

77+
<sup>8</sup> The region doesn't support Custom Neural Voice.
78+
7779
## Intent recognition
7880

7981
Available regions for intent recognition via the Speech SDK are in the following table.

articles/ai-services/speech-service/speech-services-quotas-and-limits.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ These limits aren't adjustable. For more information on batch synthesis latency,
105105
| Max number of simultaneous model trainings | N/A | 4 |
106106
| Max number of custom endpoints | N/A | 50 |
107107

108+
#### Real-time text to speech avatar
109+
110+
| Quota | Free (F0)| Standard (S0) |
111+
|--|--|--|
112+
| New connections per minute | Not available for F0 | 2 new connections per minute |
113+
108114
#### Audio Content Creation tool
109115

110116
| Quota | Free (F0)| Standard (S0) |

0 commit comments

Comments
 (0)