Skip to content

Commit 30abf23

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-landing-data-lake-store
2 parents 4e405b2 + 4f2d1c0 commit 30abf23

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

articles/cognitive-services/Speech-Service/includes/quickstarts/from-blob/csharp/dotnet.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
author: IEvangelist
33
ms.service: cognitive-services
44
ms.topic: include
5-
ms.date: 01/13/2020
5+
ms.date: 03/12/2020
66
ms.author: dapine
77
---
88

@@ -58,8 +58,9 @@ class Program
5858

5959
static async Task Main()
6060
{
61-
// For non-Windows 10 users.
62-
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
61+
// Cognitive Services follows security best practices.
62+
// If you experience connectivity issues, see:
63+
// https://docs.microsoft.com/en-us/dotnet/framework/network-programming/tls
6364
6465
await TranscribeAsync();
6566
}

articles/data-factory/data-flow-expression-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Calculates the CRC32 hash of set of column of varying primitive datatypes given
158158
___
159159
### <code>currentDate</code>
160160
<code><b>currentDate([<i>&lt;value1&gt;</i> : string]) => date</b></code><br/><br/>
161-
Gets the current date when this job starts to run. You can pass an optional timezone in the form of 'GMT', 'PST', 'UTC', 'America/Cayman'. The local timezone is used as the default.Refer Java's SimpleDateFormat for available formats. (https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html)
161+
Gets the current date when this job starts to run. You can pass an optional timezone in the form of 'GMT', 'PST', 'UTC', 'America/Cayman'. The local timezone is used as the default.Refer Java's SimpleDateFormat for available formats. ["https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html](https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html)
162162
* ``currentDate() == toDate('2250-12-31') -> false``
163163
* ``currentDate('PST') == toDate('2250-12-31') -> false``
164164
* ``currentDate('America/New_York') == toDate('2250-12-31') -> false``

articles/load-balancer/scripts/load-balancer-linux-cli-sample-zonal-frontend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ This Azure CLI script example creates everything needed to run several Ubuntu vi
5050
5151
# Create an Azure Load Balancer.
5252
az network lb create \
53-
--resource-group myResourceGroupLB \
53+
--resource-group myResourceGroup \
5454
--name myLoadBalancer \
5555
--public-ip-address myPublicIP \
5656
--frontend-ip-name myFrontEndPool \

articles/load-balancer/scripts/load-balancer-linux-cli-sample-zone-redundant-frontend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This Azure CLI script example creates everything needed to run several Ubuntu vi
4545
4646
# Create an Azure Load Balancer.
4747
az network lb create \
48-
--resource-group myResourceGroupLB \
48+
--resource-group myResourceGroup \
4949
--name myLoadBalancer \
5050
--public-ip-address myPublicIP \
5151
--frontend-ip-name myFrontEndPool \

articles/storage/files/storage-files-faq.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ This article answers common questions about Azure Files features and functionali
7676
**I really want to see a specific feature added to Azure Files. Can you add it?**
7777
The Azure Files team is interested in hearing any and all feedback you have about our service. Please vote on feature requests at [Azure Files UserVoice](https://feedback.azure.com/forums/217298-storage/category/180670-files)! We're looking forward to delighting you with many new features.
7878

79+
**Does Azure Files support file locking?**
80+
Yes, Azure Files fully supports SMB/Windows-style file locking, [see details](https://docs.microsoft.com/rest/api/storageservices/managing-file-locks).
81+
7982
## Azure File Sync
8083

8184
* <a id="afs-region-availability"></a>
@@ -206,6 +209,11 @@ This article answers common questions about Azure Files features and functionali
206209

207210
Yes, you can enable Azure AD DS or AD authentication on a file share managed by Azure file sync. Changes to the directory/file NTFS ACLs on local file servers will be tiered to Azure Files and vice-versa.
208211

212+
* <a id="ad-aad-smb-files"></a>
213+
**How can I check if I have enabled AD authentication on my storage account and the AD domain information?**
214+
215+
You can refer to the instructions provided [here](https://docs.microsoft.com/azure/storage/files/storage-files-identity-auth-active-directory-enable#enable-ad-authentication-for-your-account) to validate if Azure Files AD Authentication is enabled on your storage account and retrieve the AD domain information.
216+
209217
* <a id="encryption-at-rest"></a>
210218
**How can I ensure that my Azure file share is encrypted at rest?**
211219

articles/storage/files/storage-files-identity-auth-active-directory-enable.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to enable identity-based authentication over SMB for Azur
44
author: roygara
55
ms.service: storage
66
ms.topic: conceptual
7-
ms.date: 03/03/2020
7+
ms.date: 03/11/2020
88
ms.author: rogarana
99
---
1010

@@ -124,7 +124,8 @@ Connect-AzAccount
124124
#Select the target subscription for the current session
125125
Select-AzSubscription -SubscriptionId "<your-subscription-id-here>"
126126
127-
#Register the target storage account with your active directory environment under the target OU
127+
#Register the target storage account with your active directory environment under the target OU (for example: "OU=ComputersOU,DC=prod,DC=corp,DC=contoso,DC=com")
128+
#You can choose to create the identity that represents the storage account as either a Service Logon Account or Computer Account, depends on the AD permission you have and preference.
128129
join-AzStorageAccountForAuth -ResourceGroupName "<resource-group-name-here>" -Name "<storage-account-name-here>" -DomainAccountType "<ServiceLogonAccount|ComputerAccount>" -OrganizationalUnitName "<ou-name-here>"
129130
```
130131

@@ -147,7 +148,7 @@ Password: Kerberos key for your storage account.
147148

148149
If your OU enforces password expiration, you must update the password before the maximum password age to prevent authentication failures when accessing Azure file shares. See [Update AD account password](#update-ad-account-password) for details.
149150

150-
Keep the SID of the newly created account, you'll need it for the next step.
151+
Keep the SID of the newly created account, you'll need it for the next step. The AD identity you have just created that represent the storage account does not need to be synced to Azure AD.
151152

152153
##### c. Enable the feature on your storage account
153154

includes/storage-files-aad-permissions-and-mounting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We have introduced three Azure built-in roles for granting share-level permissio
2121
- **Storage File Data SMB Share Elevated Contributor** allows read, write, delete and modify NTFS permissions in Azure Storage file shares over SMB.
2222

2323
> [!IMPORTANT]
24-
> Full administrative control of a file share, including the ability to assign a role to an identity, requires using the storage account key. Administrative control is not supported with Azure AD credentials.
24+
> Full administrative control of a file share, including the ability to take ownership of a file, requires using the storage account key. Administrative control is not supported with Azure AD credentials.
2525
2626
You can use the Azure portal, PowerShell, or Azure CLI to assign the built-in roles to the Azure AD identity of a user for granting share-level permissions.
2727

@@ -120,4 +120,4 @@ Use the following command to mount the Azure file share. Remember to replace th
120120

121121
```
122122
net use <desired-drive-letter>: \\<storage-account-name>.file.core.windows.net\<share-name>
123-
```
123+
```

0 commit comments

Comments
 (0)