Skip to content

Commit 78938c2

Browse files
authored
Merge pull request #101098 from MicrosoftDocs/master
1/14 AM Publish
2 parents 49e14e0 + 082636d commit 78938c2

File tree

17 files changed

+93
-97
lines changed

17 files changed

+93
-97
lines changed

articles/active-directory/authentication/concept-sspr-customization.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Self-service password reset users have a "Contact your administrator" link avail
4040

4141
The contact email is sent to the following recipients in the following order:
4242

43-
1. If the **password administrator** role is assigned, administrators with this role are notified.
44-
2. If no password administrators are assigned, then administrators with the **user administrator** role are notified.
45-
3. If neither of the previous roles are assigned, then the **global administrators** are notified.
43+
1. If the **helpdesk administrator** role or **password administrator** role is assigned, administrators with these roles are notified.
44+
1. If no helpdesk administrators or password administrator are assigned, then administrators with the **user administrator** role are notified.
45+
1. If none of the previous roles are assigned, then the **global administrators** are notified.
4646

4747
In all cases, a maximum of 100 recipients are notified.
4848

articles/active-directory/conditional-access/howto-conditional-access-policy-location.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ With the location condition in Conditional Access, you can control access to you
2727
1. Give your location a name.
2828
1. Choose **IP ranges** if you know the specific externally accessible IPv4 address ranges that make up that location or **Countries/Regions**.
2929
1. Provide the **IP ranges** or select the **Countries/Regions** for the location you are specifying.
30-
* If you chose Countries/Regions, you can optionally choose to include unknown areas.
30+
* If you choose Countries/Regions, you can optionally choose to include unknown areas.
3131
1. Choose **Save**
3232

3333
More information about the location condition in Conditional Access can be found in the article,

articles/automation/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
- name: PowerShell modules
316316
items:
317317
- name: Modules
318-
href: automation-integration-modules.md
318+
href: shared-resources/modules.md
319319
- name: Using Az modules in Azure Automation
320320
href: az-modules.md
321321
- name: Update Azure PowerShell modules

articles/azure-maps/traffic-coverage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ However, Maps does not have the same level of information and accuracy for all c
4242
|Hong Kong SAR |||
4343
|India |||
4444
|Indonesia |||
45+
|Kazakhstan |||
4546
|Macao SAR |||
4647
|Malaysia |||
4748
|New Zealand |||

articles/azure-monitor/app/sampling.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, Telemetr
178178
// Alternately, the following configures adaptive sampling with 5 items per second, and also excludes DependencyTelemetry from being subject to sampling.
179179
// builder.UseAdaptiveSampling(maxTelemetryItemsPerSecond:5, excludedTypes: "Dependency");
180180
181-
builder.Build();
182-
183181
// If you have other telemetry processors:
184182
builder.Use((next) => new AnotherProcessor(next));
183+
184+
builder.Build();
185+
185186
// ...
186187
}
187188

articles/container-registry/container-registry-tasks-multi-step.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,33 @@ A multi-step task in ACR Tasks is defined as a series of steps within a YAML fil
4545
The following snippets show how to combine these task step types. Multi-step tasks can be as simple as building a single image from a Dockerfile and pushing to your registry, with a YAML file similar to:
4646

4747
```yml
48-
version: v1.0.0
48+
version: v1.1.0
4949
steps:
50-
- build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} .
51-
- push: ["{{.Run.Registry}}/hello-world:{{.Run.ID}}"]
50+
- build: -t $Registry/hello-world:$ID .
51+
- push: ["$Registry/hello-world:$ID"]
5252
```
5353
5454
Or more complex, such as this fictitious multi-step definition which includes steps for build, test, helm package, and helm deploy (container registry and Helm repository configuration not shown):
5555
5656
```yml
57-
version: v1.0.0
57+
version: v1.1.0
5858
steps:
5959
- id: build-web
60-
build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} .
60+
build: -t $Registry/hello-world:$ID .
6161
when: ["-"]
6262
- id: build-tests
63-
build -t {{.Run.Registry}}/hello-world-tests ./funcTests
63+
build -t $Registry/hello-world-tests ./funcTests
6464
when: ["-"]
6565
- id: push
66-
push: ["{{.Run.Registry}}/helloworld:{{.Run.ID}}"]
66+
push: ["$Registry/helloworld:$ID"]
6767
when: ["build-web", "build-tests"]
6868
- id: hello-world-web
69-
cmd: {{.Run.Registry}}/helloworld:{{.Run.ID}}
69+
cmd: $Registry/helloworld:$ID
7070
- id: funcTests
71-
cmd: {{.Run.Registry}}/helloworld:{{.Run.ID}}
71+
cmd: $Registry/helloworld:$ID
7272
env: ["host=helloworld:80"]
73-
- cmd: {{.Run.Registry}}/functions/helm package --app-version {{.Run.ID}} -d ./helm ./helm/helloworld/
74-
- cmd: {{.Run.Registry}}/functions/helm upgrade helloworld ./helm/helloworld/ --reuse-values --set helloworld.image={{.Run.Registry}}/helloworld:{{.Run.ID}}
73+
- cmd: $Registry/functions/helm package --app-version $ID -d ./helm ./helm/helloworld/
74+
- cmd: $Registry/functions/helm upgrade helloworld ./helm/helloworld/ --reuse-values --set helloworld.image=$Registry/helloworld:$ID
7575
```
7676
7777
See [task examples](container-registry-tasks-samples.md) for multi-step task YAML files and Dockerfiles for several scenarios.

articles/container-registry/container-registry-tasks-reference-yaml.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Task properties typically appear at the top of an `acr-task.yaml` file, and are
7474
| -------- | ---- | -------- | ----------- | ------------------ | ------------- |
7575
| `version` | string | Yes | The version of the `acr-task.yaml` file as parsed by the ACR Tasks service. While ACR Tasks strives to maintain backward compatibility, this value allows ACR Tasks to maintain compatibility within a defined version. If unspecified, defaults to the latest version. | No | None |
7676
| `stepTimeout` | int (seconds) | Yes | The maximum number of seconds a step can run. If the property is specified on a task, it sets the default `timeout` property of all the steps. If the `timeout` property is specified on a step, it overrides the property provided by the task. | Yes | 600 (10 minutes) |
77-
| `workingDirectory` | string | Yes | The working directory of the container during runtime. If the property is specified on a task, it sets the default `workingDirectory` property of all the steps. If specified on a step, it overrides the property provided by the task. | Yes | `$HOME` |
77+
| `workingDirectory` | string | Yes | The working directory of the container during runtime. If the property is specified on a task, it sets the default `workingDirectory` property of all the steps. If specified on a step, it overrides the property provided by the task. | Yes | `/workspace` |
7878
| `env` | [string, string, ...] | Yes | Array of strings in `key=value` format that define the environment variables for the task. If the property is specified on a task, it sets the default `env` property of all the steps. If specified on a step, it overrides any environment variables inherited from the task. | None |
7979
| `secrets` | [secret, secret, ...] | Yes | Array of [secret](#secret) objects. | None |
8080
| `networks` | [network, network, ...] | Yes | Array of [network](#network) objects. | None |
@@ -374,7 +374,7 @@ Each step type supports several properties appropriate for its type. The followi
374374
| `timeout` | int (seconds) | Yes | Maximum number of seconds a step may execute before being terminated. | 600 |
375375
| [`when`](#example-when) | [string, string, ...] | Yes | Configures a step's dependency on one or more other steps within the task. | None |
376376
| `user` | string | Yes | The user name or UID of a container | None |
377-
| `workingDirectory` | string | Yes | Sets the working directory for a step. By default, ACR Tasks creates a root directory as the working directory. However, if your build has several steps, earlier steps can share artifacts with later steps by specifying the same working directory. | `$HOME` |
377+
| `workingDirectory` | string | Yes | Sets the working directory for a step. By default, ACR Tasks creates a root directory as the working directory. However, if your build has several steps, earlier steps can share artifacts with later steps by specifying the same working directory. | `/workspace` |
378378

379379
### Examples: Task step properties
380380

articles/firewall/tutorial-hybrid-ps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This article requires that you run PowerShell locally. You must have the Azure P
4747

4848
There are three key requirements for this scenario to work correctly:
4949

50-
- A User Defined Route (UDR) on the spoke subnet that points to the Azure Firewall IP address as the default gateway. BGP route propagation must be **Disabled** on this route table.
50+
- A User Defined Route (UDR) on the spoke subnet that points to the Azure Firewall IP address as the default gateway. Virtual network gateway route propagation must be **Disabled** on this route table.
5151
- A UDR on the hub gateway subnet must point to the firewall IP address as the next hop to the spoke networks.
5252

5353
No UDR is required on the Azure Firewall subnet, as it learns routes from BGP.
@@ -350,7 +350,7 @@ Set-AzVirtualNetwork
350350
351351
#Now create the default route
352352
353-
#Create a table, with BGP route propagation disabled
353+
#Create a table, with BGP route propagation disabled. The property is now called "Virtual network gateway route propagation," but the API still refers to the parameter as "DisableBgpRoutePropagation."
354354
$routeTableSpokeDG = New-AzRouteTable `
355355
-Name 'UDR-DG' `
356356
-ResourceGroupName $RG1 `

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This release applies both for HDInsight 3.6 and 4.0. HDInsight release is made a
2828
### TLS 1.2 enforcement
2929
Transport Layer Security (TLS) and Secure Sockets Layer (SSL) are cryptographic protocols that provide communications security over a computer network. Learn more about [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_1.0.2C_2.0_and_3.0). HDInsight uses TLS 1.2 on public HTTPs endpoints but TLS 1.1 is still supported for backward compatibility.
3030

31-
From this release, cusotmers can opt-in TLS 1.2 enformence for all connections through TLS 1.2. A new property **minSupportedTlsVersion** is introduced via Azure Resource Manager template for cluster creation. If the property is not set, the cluster still supports 1.0, 1.1 and 1.2, same as today's behavior. Customers can set the value for this property to "1.2", which means that the cluster only supports TLS 1.2 and above.
31+
With this release, customers can opt into TLS 1.2 only for all connections through the public cluster endpoint. To support this, the new property **minSupportedTlsVersion** is introduced and can be specified during cluster creation. If the property is not set, the cluster still supports TLS 1.0, 1.1 and 1.2, which is the same as today's behavior. Customers can set the value for this property to "1.2", which means that the cluster only supports TLS 1.2 and above.
3232

3333
### Bring your own key for disk encryption
3434
All managed disks in HDInsight are protected with Azure Storage Service Encryption (SSE). Data on those disks is encrypted by Microsoft-managed keys by default. Starting from this release, you can Bring Your Own Key (BYOK) for disk encryption and manage it using Azure Key Vault. BYOK encryption is a one-step configuration during cluster creation with no additional cost. Just register HDInsight as a managed identity with Azure Key Vault and add the encryption key when you create your cluster.

articles/machine-learning/how-to-create-register-datasets.md

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,10 @@ To create datasets from an [Azure datastore](how-to-access-data.md) by using the
6565

6666
1. Verify that you have `contributor` or `owner` access to the registered Azure datastore.
6767

68-
1. Create the dataset by referencing a path in the datastore:
68+
2. Create the dataset by referencing paths in the datastore.
69+
> [!Note]
70+
> You can create a dataset from multiple paths in multiple datastores. There is no hard limit on the number of files or data size that you can create a dataset from. However, for each data path, a few requests will be sent to the storage service to check whether it points to a file or a folder. This overhead may lead to degraded performance or failure. A dataset referencing one folder with 1000 files inside is considered referencing one data path. We'd recommend creating dataset referencing less than 100 paths in datastores for optimal performance.
6971
70-
```Python
71-
from azureml.core.workspace import Workspace
72-
from azureml.core.datastore import Datastore
73-
from azureml.core.dataset import Dataset
74-
75-
datastore_name = 'your datastore name'
76-
77-
# get existing workspace
78-
workspace = Workspace.from_config()
79-
80-
# retrieve an existing datastore in the workspace by name
81-
datastore = Datastore.get(workspace, datastore_name)
82-
```
8372

8473
#### Create a TabularDataset
8574

@@ -88,12 +77,20 @@ You can create TabularDatasets through the SDK or by using Azure Machine Learnin
8877
Use the [`from_delimited_files()`](https://docs.microsoft.com/python/api/azureml-core/azureml.data.dataset_factory.tabulardatasetfactory?view=azure-ml-py#from-delimited-files-path--validate-true--include-path-false--infer-column-types-true--set-column-types-none--separator------header-true--partition-format-none-) method on the `TabularDatasetFactory` class to read files in .csv or .tsv format, and to create an unregistered TabularDataset. If you're reading from multiple files, results will be aggregated into one tabular representation.
8978

9079
```Python
91-
# create a TabularDataset from multiple paths in datastore
92-
datastore_paths = [
93-
(datastore, 'weather/2018/11.csv'),
94-
(datastore, 'weather/2018/12.csv'),
95-
(datastore, 'weather/2019/*.csv')
96-
]
80+
from azureml.core import Workspace, Datastore, Dataset
81+
82+
datastore_name = 'your datastore name'
83+
84+
# get existing workspace
85+
workspace = Workspace.from_config()
86+
87+
# retrieve an existing datastore in the workspace by name
88+
datastore = Datastore.get(workspace, datastore_name)
89+
90+
# create a TabularDataset from 3 paths in datastore
91+
datastore_paths = [(datastore, 'ather/2018/11.csv'),
92+
(datastore, 'weather/2018/12.csv'),
93+
(datastore, 'weather/2019/*.csv')]
9794
weather_ds = Dataset.Tabular.from_delimited_files(path=datastore_paths)
9895
```
9996

@@ -154,16 +151,12 @@ Use the [`from_files()`](https://docs.microsoft.com/python/api/azureml-core/azur
154151

155152
```Python
156153
# create a FileDataset pointing to files in 'animals' folder and its subfolders recursively
157-
datastore_paths = [
158-
(datastore, 'animals')
159-
]
154+
datastore_paths = [(datastore, 'animals')]
160155
animal_ds = Dataset.File.from_files(path=datastore_paths)
161156

162157
# create a FileDataset from image and label files behind public web urls
163-
web_paths = [
164-
'https://azureopendatastorage.blob.core.windows.net/mnist/train-images-idx3-ubyte.gz',
165-
'https://azureopendatastorage.blob.core.windows.net/mnist/train-labels-idx1-ubyte.gz'
166-
]
158+
web_paths = ['https://azureopendatastorage.blob.core.windows.net/mnist/train-images-idx3-ubyte.gz',
159+
'https://azureopendatastorage.blob.core.windows.net/mnist/train-labels-idx1-ubyte.gz']
167160
mnist_ds = Dataset.File.from_files(path=web_paths)
168161
```
169162

@@ -246,10 +239,8 @@ The dataset is now available in your workspace under **Datasets**. You can use i
246239
You can register a new dataset under the same name by creating a new version. A dataset version is a way to bookmark the state of your data so that you can apply a specific version of the dataset for experimentation or future reproduction. Learn more about [dataset versions](how-to-version-track-datasets.md).
247240
```Python
248241
# create a TabularDataset from Titanic training data
249-
web_paths = [
250-
'https://dprepdata.blob.core.windows.net/demo/Titanic.csv',
251-
'https://dprepdata.blob.core.windows.net/demo/Titanic2.csv'
252-
]
242+
web_paths = ['https://dprepdata.blob.core.windows.net/demo/Titanic.csv',
243+
'https://dprepdata.blob.core.windows.net/demo/Titanic2.csv']
253244
titanic_ds = Dataset.Tabular.from_delimited_files(path=web_paths)
254245

255246
# create a new version of titanic_ds

0 commit comments

Comments
 (0)