Skip to content

Commit 6e5c7b3

Browse files
authored
Merge pull request #187234 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents cd83d85 + 8db426f commit 6e5c7b3

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

articles/azure-functions/functions-identity-based-connections-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/20/2021
1010

1111
# Tutorial: Create a function app that connects to Azure services using identities instead of secrets
1212

13-
This tutorial shows you how to configure a function app using Azure Active Directory identities instead of secrets or connection strings, where possible. Using identities helps you avoid accidentally leaking sensitive secrets and can provide better visibility into how data is accessed. To learn more about identity-based connections, see [configure an identity-based connection.](functions-reference.md#configure-an-identity-based-connection).
13+
This tutorial shows you how to configure a function app using Azure Active Directory identities instead of secrets or connection strings, where possible. Using identities helps you avoid accidentally leaking sensitive secrets and can provide better visibility into how data is accessed. To learn more about identity-based connections, see [configure an identity-based connection](functions-reference.md#configure-an-identity-based-connection).
1414

1515
While the procedures shown work generally for all languages, this tutorial currently supports C# class library functions on Windows specifically.
1616

@@ -106,7 +106,7 @@ In order to use Azure Key Vault, your app will need to have an identity that can
106106

107107
1. Select **Save**. It might take a minute or two for the role to show up when you refresh the role assignments list for the identity.
108108

109-
The identity will now be able to read secrets stored in the vault. Later in the tutorial, you will add additional role assignments for different purposes.
109+
The identity will now be able to read secrets stored in the key vault. Later in the tutorial, you will add additional role assignments for different purposes.
110110

111111
### Generate a template for creating a function app
112112

@@ -304,7 +304,7 @@ Next you will update your function app to use its system-assigned identity when
304304
| Option | Suggested value | Description |
305305
| ------------ | ---------------- | ----------- |
306306
| **Name** | AzureWebJobsStorage__accountName | Update the name from **AzureWebJobsStorage** to the exact name `AzureWebJobsStorage__accountName`. This setting tells the host to use the identity instead of looking for a stored secret. The new setting uses a double underscore (`__`), which is a special character in application settings. |
307-
| **Value** | Your account name | Update the name from the connection string to just your **AccountName**. |
307+
| **Value** | Your account name | Update the name from the connection string to just your **StorageAccountName**. |
308308

309309
This configuration will let the system know that it should use an identity to connect to the resource.
310310

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ On Linux, the function app must have its `kind` set to `functionapp,linux`, and
296296
}
297297
```
298298

299-
The [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](functions-app-settings.md#website_contentazurefileconnectionstring) and [`WEBSITE_CONTENTSHARE`](functions-app-settings.md#website_contentshare) settings aren't supported on Linux.
299+
The [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](functions-app-settings.md#website_contentazurefileconnectionstring) and [`WEBSITE_CONTENTSHARE`](functions-app-settings.md#website_contentshare) settings aren't supported on a Linux Consumption plan.
300300

301301
<a name="premium"></a>
302302
## Deploy on Premium plan

articles/azure-functions/functions-openapi-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To create an API Management instance linked to your function app:
3636

3737
![Create new API Management service](media/functions-openapi-definitions/new-apim-service-openapi.png)
3838

39-
1. Choose **Create** to create the API Management instance, which may take several minutes.
39+
1. Choose **Export** to create the API Management instance, which may take several minutes.
4040

4141
1. After Azure creates the instance, it enables the **Enable Application Insights** option on the page. Select it to send logs to the same place as the function application.
4242

articles/azure-functions/functions-run-local.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ The following considerations apply to project initialization:
215215

216216
+ When you don't provide a project name, the current folder is initialized.
217217

218-
+ If you plan to publish your project to a custom Linux container, use the `--dockerfile` option to make sure that a Dockerfile is generated for your project. To learn more, see [Create a function on Linux using a custom image](functions-create-function-linux-custom-image.md).
218+
+ If you plan to publish your project to a custom Linux container, use the `--docker` option to make sure that a Dockerfile is generated for your project. To learn more, see [Create a function on Linux using a custom image](functions-create-function-linux-custom-image.md).
219219

220220
Certain languages may have additional considerations:
221221

43.9 KB
Loading

articles/iot-edge/how-to-manage-device-certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ For more information about the function of the different certificates on an IoT
188188
For these two automatically generated certificates, you have the option of setting a flag in the config file to configure the number of days for the lifetime of the certificates.
189189

190190
>[!NOTE]
191-
>There is a third auto-generated certificate that the IoT Edge security manager creates, the **IoT Edge hub server certificate**. This certificate always has a 90 day lifetime, but is automatically renewed before expiring. The auto-generated CA lifetime value set in the config file doesn't affect this certificate.
191+
>There is a third auto-generated certificate that the IoT Edge security manager creates, the **IoT Edge hub server certificate**. This certificate always has a 30 day lifetime, but is automatically renewed before expiring. The auto-generated CA lifetime value set in the config file doesn't affect this certificate.
192192

193193
Upon expiry after the specified number of days, IoT Edge has to be restarted to regenerate the device CA certificate. The device CA certificate won't be renewed automatically.
194194

0 commit comments

Comments
 (0)