Skip to content

Commit 284d5ea

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into linter2
2 parents 9412eeb + 8430844 commit 284d5ea

File tree

48 files changed

+509
-543
lines changed

Some content is hidden

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

48 files changed

+509
-543
lines changed

.openpublishing.redirection.healthcare-apis.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"redirect_document_id": true
194194
},
195195
{
196-
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/use-smart-on-fhir-proxy.md",
196+
"source_path_from_root": "/articles/healthcare-apis/use-smart-on-fhir-proxy.md",
197197
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/smart-on-fhir",
198198
"redirect_document_id": false
199199
},

articles/active-directory/hybrid/whatis-azure-ad-connect-v2.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ Yes – upgrades from any previous version of Azure AD Connect to Azure AD Conne
8181
Yes, you can do that, and it is a great way to migrate to Azure AD Connect V2 – especially if you are also upgrading to a new operating system version. You can read more about the Import/export configuration feature and how you can use it in this [article](how-to-connect-import-export-config.md).
8282

8383
**I have enabled auto upgrade for Azure AD Connect – will I get this new version automatically?** </br>
84-
Yes - your Azure AD Connect server will be upgraded to the latest release if you have enabled the auto-upgrade feature. Note that we've no yet release an auto upgrade version for Azure AD Connect.
84+
Yes - your Azure AD Connect server will be upgraded to the latest release if you have enabled the auto-upgrade feature. However, we can only upgrade your server if you are using Windows Server 2016 or newer and have enabled TLS 1.2.
8585

8686
**I am not ready to upgrade yet – how much time do I have?** </br>
87-
You should upgrade to Azure AD Connect V2 as soon as you can. **__All Azure AD Connect V1 versions will be retired on 31 August, 2022.__** For the time being we will continue to support older versions of Azure AD Connect, but it may prove difficult to provide a good support experience if some of the components in Azure AD Connect have dropped out of support. This upgrade is particularly important for ADAL and TLS1.0/1.1 as these services might stop working unexpectedly after they are deprecated.
87+
You should upgrade to Azure AD Connect V2 as soon as you can. **__All Azure AD Connect V1 versions have been retired on 31 August, 2022.__** For the time being we will continue to support older versions of Azure AD Connect, but it may prove difficult to provide a good support experience if some of the components in Azure AD Connect have dropped out of support. This upgrade is particularly important for ADAL and TLS1.0/1.1 as these services might stop working unexpectedly after they are deprecated.
8888

8989
**I use an external SQL database and don't use SQL 2012 LocalDb – do I still have to upgrade?** </br>
9090
Yes, you still need to upgrade to remain in a supported state even if you don't use SQL Server 2012, due to the TLS1.0/1.1 and ADAL deprecation. Note that SQL Server 2012 can still be used as an external SQL database with Azure AD Connect V2. The SQL 2019 drivers in Azure AD Connect V2 are compatible with SQL Server 2012.
@@ -95,9 +95,9 @@ No, the upgrade to SQL 2019 doesn't remove any SQL 2012 components from your ser
9595
**What happens if I don't upgrade?** </br>
9696
Until one of the components that are being retired are actually deprecated, you will not see any impact. Azure AD Connect will keep on working.
9797

98-
We expect TLS 1.0/1.1 to be deprecated in 2022, and you need to make sure you aren't using these protocols by that date as your service may stop working unexpectedly. You can manually configure your server for TLS 1.2 though, and that doesn't require an update of Azure AD Connect to V2
98+
Support for TLS 1.0/1.1 is deprecated in 2022, and you need to make sure you aren't using these protocols by that date as your service may stop working unexpectedly. You can manually configure your server for TLS 1.2 though, and that doesn't require an update of Azure AD Connect to V2
9999

100-
Azure AD Connect Health will stop working after December 2022. We will auto upgrade all Health agents to a new version before the end of 2022, but we cannot auto upgrade if you are running AADConnect V1 due to compatibility issues with V versions.
100+
Azure AD Connect Health may stop working after March 2023. We will auto upgrade all Health agents to a new version before that, but we cannot auto upgrade if you are running AADConnect V1 due to compatibility issues with V versions.
101101

102102
After December 2022, ADAL is planned to go out of support. When ADAL goes out of support, authentication may stop working unexpectedly, and this will block the Azure AD Connect server from working properly. We strongly advise you to upgrade to Azure AD Connect V2 before December 2022. You can't upgrade to a supported authentication library with your current Azure AD Connect version.
103103

articles/azure-arc/data/upload-usage-data.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,15 @@ Example of a `data` entry:
106106

107107
## Upload frequency
108108

109-
In the **indirect** mode, usage information needs to be uploaded to Azure at least once in every 30 days. It is highly recommended to upload more frequently, such as daily or weekly. If usage information is not uploaded past 32 days, you will see some degradation in the service such as being unable to provision any new resources.
109+
In the **indirect** mode, usage information needs to be uploaded to Azure at least once in every 30 days. It is highly recommended to upload more frequently, such as daily. If usage information is not uploaded past 32 days, you will see some degradation in the service such as being unable to provision any new resources.
110110

111111
There will be two types of notifications for delayed usage uploads - warning phase and degraded phase. In the warning phase there will be a message such as `Billing data for the Azure Arc data controller has not been uploaded in {0} hours. Please upload billing data as soon as possible.`.
112112

113113
In the degraded phase, the message will look like `Billing data for the Azure Arc data controller has not been uploaded in {0} hours. Some functionality will not be available until the billing data is uploaded.`.
114114

115+
> [!NOTE]
116+
> You will see the warning message if usage has not been uploaded for more than 48 hours.
117+
115118
The Azure portal Overview page for Data Controller and the Custom Resource status of the Data controller in your kubernetes cluster will both indicate the last upload date and the status message(s).
116119

117120

articles/cloud-services/cloud-services-deployment-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ sections:
6060
6161
You could also track the current usage/quota for your subscription at the portal: Azure portal => Subscriptions => \<appropriate subscription> => "Usage + quota".
6262
63-
Resource usage/consumption-related information can also be retrieved via the Azure Billing APIs. See [Azure consumption API overview](../cost-management-billing/manage/consumption-api-overview.md).
63+
Resource usage/consumption-related information can also be retrieved via the Azure Billing APIs. See [Azure consumption API overview](../cost-management-billing/automate/automation-overview.md).
6464
6565
- question: |
6666
How can I change the size of a deployed cloud service VM without redeploying it?

articles/cognitive-services/.openpublishing.redirection.cognitive-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,11 @@
20002000
"redirect_url": "/azure/cognitive-services/computer-vision/quickstarts-sdk/identity-client-library",
20012001
"redirect_document_id": true
20022002
},
2003+
{
2004+
"source_path_from_root": "/articles/cognitive-services/computer-vision/how-to/identity-analyze-video.md",
2005+
"redirect_url": "/azure/cognitive-services/computer-vision/overview-identity",
2006+
"redirect_document_id": false
2007+
},
20032008
{
20042009
"source_path_from_root": "/articles/cognitive-services/Face/QuickStarts/csharp-detect-sdk.md",
20052010
"redirect_url": "/azure/cognitive-services/face/quickstarts/csharp-sdk",

articles/cognitive-services/Computer-vision/Tutorials/build-enrollment-app.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ The sample app is written using JavaScript and the React Native framework. It ca
2525
* An Azure subscription – [Create one for free](https://azure.microsoft.com/free/cognitive-services/).
2626
* Once you have your Azure subscription, [create a Face resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesFace) in the Azure portal to get your key and endpoint. After it deploys, select **Go to resource**.
2727
* You'll need the key and endpoint from the resource you created to connect your application to Face API.
28-
* For local development and testing only, the API key and endpoint are environment variables. For final deployment, store the API key in a secure location and never in the code or environment variables.
2928

3029
### Important Security Considerations
3130
* For local development and initial limited testing, it is acceptable (although not best practice) to use environment variables to hold the API key and endpoint. For pilot and final deployments, the API key should be stored securely - which likely involves using an intermediate service to validate a user token generated during login.
@@ -40,14 +39,22 @@ The sample app is written using JavaScript and the React Native framework. It ca
4039
1. To set up your development environment, follow the <a href="https://reactnative.dev/docs/environment-setup" title="React Native documentation" target="_blank">React Native documentation <span class="docon docon-navigate-external x-hidden-focus"></span></a>. Select **React Native CLI Quickstart**. Select your development OS and **Android** as the target OS. Complete the sections **Installing dependencies** and **Android development environment**.
4140
1. Download your preferred text editor such as [Visual Studio Code](https://code.visualstudio.com/).
4241
1. Retrieve your FaceAPI endpoint and key in the Azure portal under the **Overview** tab of your resource. Don't check in your Face API key to your remote repository.
42+
43+
> [!WARNING]
44+
> For local development and testing only, you can enter the API key and endpoint as environment variables. For final deployment, store the API key in a secure location and never in the code or environment variables. See the [Cognitive Services Authentication guide](/azure/cognitive-services/authentication) for other ways to authenticate the service.
45+
4346
1. Run the app using either the Android Virtual Device emulator from Android Studio, or your own Android device. To test your app on a physical device, follow the relevant <a href="https://reactnative.dev/docs/running-on-device" title="React Native documentation" target="_blank">React Native documentation <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
4447

4548
#### [iOS](#tab/ios)
4649

4750
1. Clone the git repository for the [sample app](https://github.com/azure-samples/cognitive-services-FaceAPIEnrollmentSample).
4851
1. To set up your development environment, follow the <a href="https://reactnative.dev/docs/environment-setup" title="React Native documentation" target="_blank">React Native documentation <span class="docon docon-navigate-external x-hidden-focus"></span></a>. Select **React Native CLI Quickstart**. Select **macOS** as your development OS and **iOS** as the target OS. Complete the section **Installing dependencies**.
4952
1. Download your preferred text editor such as [Visual Studio Code](https://code.visualstudio.com/). You will also need to download Xcode.
50-
1. Retrieve your FaceAPI endpoint and key in the Azure portal under the **Overview** tab of your resource. Don't check in your Face API key to your remote repository.
53+
1. Retrieve your FaceAPI endpoint and key in the Azure portal under the **Overview** tab of your resource.
54+
55+
> [!WARNING]
56+
> For local development and testing only, you can enter the API key and endpoint as environment variables. For final deployment, store the API key in a secure location and never in the code or environment variables. See the [Cognitive Services Authentication guide](/azure/cognitive-services/authentication) for other ways to authenticate the service.
57+
5158
1. Run the app using either a simulated device from Xcode, or your own iOS device. To test your app on a physical device, follow the relevant <a href="https://reactnative.dev/docs/running-on-device" title="React Native documentation" target="_blank">React Native documentation <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
5259

5360
---

0 commit comments

Comments
 (0)