Skip to content

Commit 0d3a114

Browse files
authored
Merge pull request #79624 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 9196950 + 1cad16d commit 0d3a114

11 files changed

+61
-10
lines changed

.markdownlint.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"default": true,
3+
"MD001": false,
4+
"MD002": false,
5+
"MD003": false,
6+
"MD004": false,
7+
"MD005": false,
8+
"MD006": false,
9+
"MD007": false,
10+
"MD009": false,
11+
"MD010": false,
12+
"MD011": false,
13+
"MD012": false,
14+
"MD013": false,
15+
"MD014": false,
16+
"MD018": false,
17+
"MD019": false,
18+
"MD020": false,
19+
"MD021": false,
20+
"MD022": false,
21+
"MD023": false,
22+
"MD024": false,
23+
"MD025": false,
24+
"MD026": false,
25+
"MD027": false,
26+
"MD028": false,
27+
"MD029": false,
28+
"MD030": false,
29+
"MD031": false,
30+
"MD032": false,
31+
"MD033": false,
32+
"MD034": false,
33+
"MD035": false,
34+
"MD036": false,
35+
"MD037": false,
36+
"MD038": false,
37+
"MD039": false,
38+
"MD040": false,
39+
"MD041": false,
40+
"MD042": false,
41+
"MD045": false
42+
}

articles/active-directory/saas-apps/sharepoint-on-premises-tutorial.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ To configure the integration of SharePoint on-premises into Azure AD, you need t
5353

5454
![The Azure Active Directory button](common/select-azuread.png)
5555

56+
> [!NOTE]
57+
> If the element should not be available, it can also be opened through the fixed **All services** link at the top of the left navigation panel. In the following overview, the **Azure Active Directory** link is located in the **Identity** section or it can be searched for by using the filter text box.
58+
5659
2. Navigate to **Enterprise Applications** and then select the **All Applications** option.
5760

5861
![The Enterprise applications blade](common/enterprise-applications.png)

articles/app-service/app-service-authentication-how-to.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ms.topic: article
1515
ms.date: 11/08/2018
1616
ms.author: cephalin
1717
ms.custom: seodec18
18-
1918
---
2019

2120
# Advanced usage of authentication and authorization in Azure App Service

articles/azure-functions/functions-create-first-java-maven.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ mvn archetype:generate `
5858

5959
```cmd
6060
mvn archetype:generate ^
61-
-DarchetypeGroupId=com.microsoft.azure ^
62-
-DarchetypeArtifactId=azure-functions-archetype
61+
"-DarchetypeGroupId=com.microsoft.azure" ^
62+
"-DarchetypeArtifactId=azure-functions-archetype"
6363
```
6464

6565
Maven will ask you for values needed to finish generating the project. For _groupId_, _artifactId_, and _version_ values, see the [Maven naming conventions](https://maven.apache.org/guides/mini/guide-naming-conventions.html) reference. The _appName_ value must be unique across Azure, so Maven generates an app name based on the previously entered _artifactId_ as a default. The _packageName_ value determines the Java package for the generated function code.

articles/azure-functions/functions-dotnet-dependency-injection.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Before you can use dependency injection, you must install the following NuGet pa
2727

2828
- [Microsoft.NET.Sdk.Functions package](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/) version 1.0.28 or later
2929

30+
- Optional: [Microsoft.Extensions.Http](https://www.nuget.org/packages/Microsoft.Extensions.Http/) Only required for registering HttpClient at startup
31+
3032
## Register services
3133

3234
To register services, you can create a method to configure and add components to an `IFunctionsHostBuilder` instance. The Azure Functions host creates an instance of `IFunctionsHostBuilder` and passes it directly into your method.

articles/azure-monitor/platform/collect-custom-metrics-guestos-resource-manager-vm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ Add this Managed Service Identity (MSI) extension to the template at the top of
7171
// Add this code directly below.
7272
{
7373
"type": "Microsoft.Compute/virtualMachines/extensions",
74-
"name": "WADExtensionSetup",
75-
"apiVersion": "2015-05-01-preview",
74+
"name": "[concat(variables('vmName'), '/', 'WADExtensionSetup')]",
75+
"apiVersion": "2017-12-01",
7676
"location": "[resourceGroup().location]",
7777
"dependsOn": [
7878
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" ],
@@ -142,7 +142,7 @@ Add the following configuration to enable the Diagnostics extension on a Windows
142142
{
143143
"type": "extensions",
144144
"name": "Microsoft.Insights.VMDiagnosticsSettings",
145-
"apiVersion": "2015-05-01-preview",
145+
"apiVersion": "2017-12-01",
146146
"location": "[resourceGroup().location]",
147147
"dependsOn": [
148148
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"

articles/azure-netapp-files/azure-netapp-files-network-topologies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The features below are currently unsupported for Azure NetApp Files:
3737

3838
The following network restrictions apply to Azure NetApp Files:
3939

40-
* The number of VMs that can connect to a volume (with a VNet or across peered VNets) cannot exceed 1000.
40+
* The number of VMs in a VNet with Azure NetApp Files (or across peered VNets) cannot exceed 1000.
4141
* In each Azure Virtual Network (VNet), only one subnet can be delegated to Azure NetApp Files.
4242

4343

articles/cdn/cdn-custom-ssl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ For more information about CNAME records, see [Create the CNAME DNS record](http
179179

180180
If your CNAME record is in the correct format, DigiCert automatically verifies your custom domain name and creates a dedicated certificate for your domain name. DigitCert won't send you a verification email and you won't need to approve your request. The certificate is valid for one year and will be auto-renewed before it expires. Proceed to [Wait for propagation](#wait-for-propagation).
181181

182-
Automatic validation typically takes a few mins. If you don’t see your domain validated within an hour, open a support ticket.
182+
Automatic validation typically takes a few hours. If you don’t see your domain validated in 24 hours, open a support ticket.
183183

184184
>[!NOTE]
185185
>If you have a Certificate Authority Authorization (CAA) record with your DNS provider, it must include DigiCert as a valid CA. A CAA record allows domain owners to specify with their DNS providers which CAs are authorized to issue certificates for their domain. If a CA receives an order for a certificate for a domain that has a CAA record and that CA is not listed as an authorized issuer, it is prohibited from issuing the certificate to that domain or subdomain. For information about managing CAA records, see [Manage CAA records](https://support.dnsimple.com/articles/manage-caa-record/). For a CAA record tool, see [CAA Record Helper](https://sslmate.com/caa/).

articles/data-factory/control-flow-azure-function-activity.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ Azure Functions times out after 230 seconds regardless of the `functionTimeout`
6060
Learn more about Durable Functions in [this article](../azure-functions/durable/durable-functions-overview.md). You can set up an Azure Function Activity to call the Durable Function, which will return a response with a different URI, such as [this example](../azure-functions/durable/durable-functions-http-api.md#http-api-url-discovery). Because `statusQueryGetUri` returns HTTP Status 202 while the function is running, you can poll the status of the function by using a Web Activity. Simply set up a Web Activity with the `url` field set to `@activity('<AzureFunctionActivityName>').output.statusQueryGetUri`. When the Durable Function completes, the output of the function will be the output of the Web Activity.
6161

6262

63+
## Sample
64+
65+
You can find a sample of a Data Factory that uses an Azure Function to extract the content of a tar file [here](https://github.com/Azure/Azure-DataFactory/tree/master/SamplesV2/UntarAzureFilesWithAzureFunction).
66+
6367
## Next steps
6468

6569
Learn more about activities in Data Factory in [Pipelines and activities in Azure Data Factory](concepts-pipelines-activities.md).

articles/security/azure-security-disk-encryption-prerequisites.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ For Windows Server 2008 R2, you must have .NET Framework 4.5 installed before yo
4040
- Make sure the /etc/fstab settings are configured properly for mounting. To configure these settings, run the mount -a command or reboot the VM and trigger the remount that way. Once that is complete, check the output of the lsblk command to verify that the drive is still mounted.
4141
- If the /etc/fstab file doesn't mount the drive properly before enabling encryption, Azure Disk Encryption won't be able to mount it properly.
4242
- The Azure Disk Encryption process will move the mount information out of /etc/fstab and into its own configuration file as part of the encryption process. Don't be alarmed to see the entry missing from /etc/fstab after data drive encryption completes.
43-
- After reboot, it will take time for the Azure Disk Encryption process to mount the newly encrypted disks. They won't be immediately available after a reboot. The process needs time to start, unlock, and then mount the encrypted drives before being available for other processes to access. This process may take more than a minute after reboot depending on the system characteristics.
43+
- Before starting encryption, be sure to stop all services and processes that could be writing to mounted data disks and disable them, so that they do not restart automatically after a reboot. These could keep files open on these partitions, preventing the encryption procedure to remount them, causing failure of the encryption.
44+
- After reboot, it will take time for the Azure Disk Encryption process to mount the newly encrypted disks. They won't be immediately available after a reboot. The process needs time to start, unlock, and then mount the encrypted drives before being available for other processes to access. This process may take more than a minute after reboot depending on the system characteristics.
4445

4546
An example of commands that can be used to mount the data disks and create the necessary /etc/fstab entries can be found in [lines 244-248 of this script file](https://github.com/ejarvi/ade-cli-getting-started/blob/master/validate.sh#L244-L248).
4647

0 commit comments

Comments
 (0)