Skip to content

Commit 90a553e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ultraPrem
2 parents 87f6454 + 7a96ba9 commit 90a553e

File tree

57 files changed

+1143
-614
lines changed

Some content is hidden

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

57 files changed

+1143
-614
lines changed

articles/active-directory/app-provisioning/on-premises-ecma-troubleshoot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: amycolannino
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 11/29/2022
10+
ms.date: 12/13/2022
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -51,12 +51,12 @@ After you configure the provisioning agent and ECMA host, it's time to test conn
5151
https://localhost:8585/ecma2host_connectorName/scim
5252
```
5353
1. Navigate to the following folder to review the provisoning agent logs: C:\ProgramData\Microsoft\Azure AD Connect Provisioning Agent\Trace
54-
1. If you see the following error, please add the service account "NT SERVICE\AADConnectProvisioningAgent" to the local group called "Performance Log Users". This eliminates the "Unable to initialize metrics collector" exception error by allowing the account to access the desired registry key: HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib
54+
1. If you see the following error, please add the service account "NT SERVICE\AADConnectProvisioningAgent" to the local group called "Performance Log Users". This eliminates the "Unable to initialize metrics collector" exception error by allowing the account to access the desired registry key: HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Perflib
5555
5656
```
5757
Unable to initialize metrics collector, exception: 'System.UnauthorizedAccessException: Access to the registry key 'Global' is denied.
5858
```
59-
13. When configuring the ECMA host, ensure that you provide a certificate with a subject that matches the hostname of your windows server. The certificate that is generated by the ECMA host will do this for you automatically, but should only be used for testing purposes.
59+
12. When configuring the ECMA host, ensure that you provide a certificate with a subject that matches the hostname of your windows server. The certificate that is generated by the ECMA host will do this for you automatically, but should only be used for testing purposes.
6060
6161
```
6262
Error code: SystemForCrossDomainIdentityManagementCredentialValidationUnavailable

articles/active-directory/conditional-access/terms-of-use.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ A: On the Terms of use blade, select the number under **Accepted**. You can also
385385
**Q: How long is information stored?**<br />
386386
A: The user counts in the terms of use report and who accepted/declined are stored for the life of the terms of use. The Azure AD audit logs are stored for 30 days.
387387

388-
**Q: Why do I see a different number of consents in the terms of use report vs. the Azure AD audit logs?**<br />
389-
A: The terms of use report is stored for the lifetime of that terms of use policy, while the Azure AD audit logs are stored for 30 days. Also, the terms of use report only displays the users current consent state. For example, if a user declines and then accepts, the terms of use report will only show that user's accept. If you need to see the history, you can use the Azure AD audit logs.
388+
**Q: Why do I see a different number of consents in the terms of use details overview versus the exported CSV report?**<br />
389+
A: The terms of use details overview reflects aggregated acceptances of the current version of the policy (updated once every day). If expiration is enabled or a TOU agreement is updated (with re-acceptance required), the count on the details overview is reset since the acceptances are expired, thereby showing the count of the current version. All acceptance history is still captured in the CSV report.
390390

391391
**Q: If hyperlinks are in the terms of use policy PDF document, will end users be able to click them?**<br />
392392
A: Yes, end users are able to select hyperlinks to other pages but links to sections within the document aren't supported. Also, hyperlinks in terms of use policy PDFs don't work when accessed from the Azure AD MyApps/MyAccount portal.

articles/active-directory/manage-apps/f5-aad-password-less-vpn.md

Lines changed: 186 additions & 167 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/f5-bigip-deployment-guide.md

Lines changed: 305 additions & 300 deletions
Large diffs are not rendered by default.

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,26 @@ This article describes the steps for deploying the self-hosted gateway component
3535
5. Select the **Kubernetes** tab under **Deployment scripts**.
3636
6. Select the **\<gateway-name\>.yml** file link and download the YAML file.
3737
7. Select the **copy** icon at the lower-right corner of the **Deploy** text box to save the `kubectl` commands to the clipboard.
38-
8. Paste commands to the terminal (or command) window. The first command creates a Kubernetes secret that contains the access token generated in step 4. The second command applies the configuration file downloaded in step 6 to the Kubernetes cluster and expects the file to be in the current directory.
38+
8. When using Azure Kubernetes Service (AKS), run `az aks get-credentials --resource-group <resource-group-name> --name <resource-name> --admin` in a new terminal session.
3939
9. Run the commands to create the necessary Kubernetes objects in the [default namespace](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/) and start self-hosted gateway pods from the [container image](https://aka.ms/apim/shgw/registry-portal) downloaded from the Microsoft Artifact Registry.
40+
- The first step creates a Kubernetes secret that contains the access token generated in step 4. Next, it creates a Kubernetes deployment for the self-hosted gateway which uses a ConfigMap with the configuration of the gateway.
4041
10. Run the following command to check if the deployment succeeded. Note that it might take a little time for all the objects to be created and for the pods to initialize.
4142

4243
```console
4344
kubectl get deployments
44-
NAME READY UP-TO-DATE AVAILABLE AGE
45+
```
46+
It should return
47+
```console
48+
NAME READY UP-TO-DATE AVAILABLE AGE
4549
<gateway-name> 1/1 1 1 18s
4650
```
4751
11. Run the following command to check if the service was successfully created. Note that your service IPs and ports will be different.
4852

4953
```console
5054
kubectl get services
55+
```
56+
It should return
57+
```console
5158
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
5259
<gateway-name> LoadBalancer 10.99.236.168 <pending> 80:31620/TCP,443:30456/TCP 9m1s
5360
```

articles/azure-functions/durable/quickstart-mssql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ To run your app in Azure, you will need a publicly accessible SQL Server instanc
199199
You can follow [these](/azure/azure-sql/database/single-database-create-quickstart) instructions to create an Azure SQL database on the portal. When configuring the database, make sure to set the *Database collation* (under _Additional settings_) to `Latin1_General_100_BIN2_UTF8`.
200200

201201
> [!NOTE]
202-
> Microsoft offers a [12-month free Azure subscription account]((https://azure.microsoft.com/free/) if you’re exploring Azure for the first time.
202+
> Microsoft offers a [12-month free Azure subscription account](https://azure.microsoft.com/free/) if you’re exploring Azure for the first time.
203203
204204
You may obtain your Azure SQL database's connection string by navigating to the database's blade in the Azure portal. Then, under Settings, select "Connection strings" and obtain the "ADO.NET" connection string. Make sure to provide your password in the template provided.
205205

articles/azure-functions/functions-bindings-service-bus.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Service Bus bindings for Azure Functions
33
description: Learn to send Azure Service Bus triggers and bindings in Azure Functions.
44
ms.assetid: daedacf0-6546-4355-a65c-50873e74f66b
55
ms.topic: reference
6-
ms.date: 03/04/2022
6+
ms.date: 12/12/2022
77
ms.custom: fasttrack-edit
88
zone_pivot_groups: programming-languages-set-functions-lang-workers
99
---
@@ -163,8 +163,6 @@ This section describes the configuration settings available for this binding, wh
163163
}
164164
```
165165

166-
When you set the `isSessionsEnabled` property or attribute on [the trigger](functions-bindings-service-bus-trigger.md) to `true`, the `sessionHandlerOptions` is honored. When you set the `isSessionsEnabled` property or attribute on [the trigger](functions-bindings-service-bus-trigger.md) to `false`, the `messageHandlerOptions` is honored.
167-
168166
The `clientRetryOptions` settings only apply to interactions with the Service Bus service. They don't affect retries of function executions. For more information, see [Retries](functions-bindings-error-pages.md#retries).
169167

170168

@@ -180,8 +178,8 @@ The `clientRetryOptions` settings only apply to interactions with the Service Bu
180178
| **webProxy**| n/a | The proxy to use for communicating with Service Bus over web sockets. A proxy cannot be used with the `amqpTcp` transport. |
181179
|**autoCompleteMessages**|`true`|Determines whether or not to automatically complete messages after successful execution of the function and should be used in place of the `autoComplete` configuration setting.|
182180
|**maxAutoLockRenewalDuration**|`00:05:00`|The maximum duration within which the message lock will be renewed automatically. This setting only applies for functions that receive a single message at a time.|
183-
|**maxConcurrentCalls**|`16`|The maximum number of concurrent calls to the callback that should be initiated per scaled instance. By default, the Functions runtime processes multiple messages concurrently. This setting only applies for functions that receive a single message at a time.|
184-
|**maxConcurrentSessions**|`8`|The maximum number of sessions that can be handled concurrently per scaled instance. This setting only applies for functions that receive a single message at a time.|
181+
|**maxConcurrentCalls**|`16`|The maximum number of concurrent calls to the callback that should be initiated per scaled instance. By default, the Functions runtime processes multiple messages concurrently. This setting is used only when the `isSessionsEnabled` property or attribute on [the trigger](functions-bindings-service-bus-trigger.md) is set to `false`. This setting only applies for functions that receive a single message at a time.|
182+
|**maxConcurrentSessions**|`8`|The maximum number of sessions that can be handled concurrently per scaled instance. This setting is used only when the `isSessionsEnabled` property or attribute on [the trigger](functions-bindings-service-bus-trigger.md) is set to `true`. This setting only applies for functions that receive a single message at a time.|
185183
|**maxMessageBatchSize**|`1000`|The maximum number of messages that will be passed to each function call. This setting only applies for functions that receive a batch of messages.|
186184
|**sessionIdleTimeout**|n/a|The maximum amount of time to wait for a message to be received for the currently active session. After this time has elapsed, the processor will close the session and attempt to process another session. This setting only applies for functions that receive a single message at a time.|
187185
|**enableCrossEntityTransactions**|`false`|Whether or not to enable transactions that span multiple entities on a Service Bus namespace.|

articles/cognitive-services/language-service/concepts/model-lifecycle.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ By default, all API requests will use the latest Generally Available (GA) model.
2828

2929
#### Choose the model-version used on your data
3030

31-
We recommend using the `latest` model version to utilize the latest and highest quality models. As our models improve, it’s possible that some of your model results may change.
31+
We strongly recommend using the `latest` model version to utilize the latest and highest quality models. As our models improve, it’s possible that some of your model results may change. Model versions may be deprecated, so don't recommend including specified versions in your implementation.
3232

3333
Preview models used for preview features do not maintain a minimum retirement period and may be deprecated at any time.
3434

@@ -40,25 +40,23 @@ By default, API and SDK requests will use the latest Generally Available model.
4040
4141
Use the table below to find which model versions are supported by each feature:
4242

43-
| Feature | Supported versions | Model versions deprecated on October 30, 2022|
44-
|-----------------------------------------------------|-----------------------------|------------------------|
45-
| Sentiment Analysis and opinion mining | `2021-10-01`, `2022-06-01*` | `2019-10-01`, `2020-04-01` |
46-
| Language Detection | `2021-11-20*` | `2019-10-01`, `2020-07-01`, `2020-09-01`, `2021-01-05` |
47-
| Entity Linking | `2021-06-01*` | `2019-10-01`, `2020-02-01` |
48-
| Named Entity Recognition (NER) | `2021-06-01*`, `2022-10-01-preview` | `2019-10-01`, `2020-02-01`, `2020-04-01`, `2021-01-15` |
49-
| Personally Identifiable Information (PII) detection | `2020-07-01`, `2021-01-15*` | `2019-10-01`, `2020-02-01`, `2020-04-01`, `2020-07-01` |
50-
| PII detection for conversations (Preview) | `2022-05-15-preview**` | |
51-
| Question answering | `2021-10-01*` | |
52-
| Text Analytics for health | `2021-05-15`, `2022-03-01*`, `2022-08-15-preview**` | |
53-
| Key phrase extraction | `2021-06-01`, `2022-07-01*` | `2019-10-01`, `2020-07-01` |
54-
| Document summarization - extractive only (preview) | `2022-08-31-preview**` | |
43+
| Feature | Supported versions |
44+
|-----------------------------------------------------|-----------------------------|
45+
| Sentiment Analysis and opinion mining | `2021-10-01`, `2022-06-01`,`2022-10-01`,`2022-11-01*` |
46+
| Language Detection | `2021-11-20*` |
47+
| Entity Linking | `2021-06-01*` |
48+
| Named Entity Recognition (NER) | `2021-06-01*`, `2022-10-01-preview` |
49+
| Personally Identifiable Information (PII) detection | `2020-07-01`, `2021-01-15*` |
50+
| PII detection for conversations (Preview) | `2022-05-15-preview**` |
51+
| Question answering | `2021-10-01*` |
52+
| Text Analytics for health | `2021-05-15`, `2022-03-01*`, `2022-08-15-preview**` |
53+
| Key phrase extraction | `2021-06-01`, `2022-07-01`,`2022-10-01*` |
54+
| Document summarization - extractive only (preview) | `2022-08-31-preview**` |
5555

5656
\* Latest Generally Available (GA) model version
5757

5858
\*\* Latest preview version
5959

60-
> [!IMPORTANT]
61-
> The versions listed for deprecation will be unavailable for use after October 30, 2022.
6260

6361
## Custom features
6462

articles/communication-services/quickstarts/chat/quickstart-botframework-integration.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ ms.custom: mode-other
1414

1515
# Add a bot to your chat app
1616

17-
> [!IMPORTANT]
18-
> This functionality is in public preview.
19-
>
17+
[!INCLUDE Public Preview Notice]
2018

2119
In this quickstart, you will learn how to build conversational AI experiences in a chat application using Azure Communication Services Chat messaging channel that is available under Azure Bot Services. This article will describe how to create a bot using BotFramework SDK and how to integrate this bot into any chat application that is built using Communication Services Chat SDK.
2220

@@ -33,8 +31,6 @@ You will learn how to:
3331
- [Visual Studio (2019 and above)](https://visualstudio.microsoft.com/vs/)
3432
- Latest version of .NET Core. For this tutorial, we have used [.NET Core 3.1](https://dotnet.microsoft.com/download/dotnet-core/3.1) (Make sure to install the version that corresponds with your visual studio instance, 32 vs 64 bit)
3533

36-
37-
3834
## Step 1 - Create and deploy an Azure bot
3935

4036
To use Azure Communication Services chat as a channel in Azure Bot Service, the first step is to deploy a bot. You can do so by following below steps:

articles/container-apps/dapr-github-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Replace \<Placeholders\> with your values.
6262
```powershell
6363
$ResourceGroup="my-containerapp-store"
6464
$Location="canadacentral"
65-
$GithubUsername="<GithubUsername>"
65+
$GitHubUsername="<GitHubUsername>"
6666
$SubscriptionId="<SubscriptionId>"
6767
```
6868

@@ -117,7 +117,7 @@ Now that you've validated your Azure CLI setup, bring the application code to yo
117117
# [PowerShell](#tab/powershell)
118118
119119
```git
120-
git clone https://github.com/$GithubUsername/container-apps-store-api-microservice.git
120+
git clone https://github.com/$GitHubUsername/container-apps-store-api-microservice.git
121121
```
122122
123123
---

0 commit comments

Comments
 (0)