Skip to content

Commit 11f5ee7

Browse files
authored
Merge pull request #219040 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 3fecc7a + 1751d3c commit 11f5ee7

14 files changed

+17
-16
lines changed

articles/azure-monitor/faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ sections:
385385
- question: |
386386
Does the Azure Monitor Agent support non-Azure environments (other clouds, on-premises)?
387387
answer: |
388-
Both on-premises machines and machines connected to other clouds are supported for servers today, once you have the Azure Arc agent installed. For purposes of running AMA and DCR, the ARC requirement comes at **no extra cost or resource consumption**, since the ARC agent is only used as an installation mechanism and you need not enable the paid management features if you don’t wish to use them.
388+
Both on-premises machines and machines connected to other clouds are supported for servers today, once you have the Azure Arc agent installed. For purposes of running AMA and DCR, the Arc requirement comes at **no extra cost or resource consumption**, since the Arc agent is only used as an installation mechanism and you need not enable the paid management features if you don’t wish to use them.
389389
390390
- question: |
391391
Does the Azure Monitor Agent support private links?
@@ -1229,4 +1229,4 @@ additionalContent: |
12291229
- [Log Analytics](/answers/topics/azure-monitor.html)
12301230
- [Application Insights](/answers/topics/azure-monitor.html)
12311231
1232-
For general feedback on Azure Monitor please visit the [feedback forum](https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4).
1232+
For general feedback on Azure Monitor please visit the [feedback forum](https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4).

articles/key-vault/general/azure-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ If the compliance results show up as "Not Started" it may be due to the followin
255255

256256
> [!NOTE]
257257
> Azure Policy
258-
> [Resouce Provider modes](../../governance/policy/concepts/definition-structure.md#resource-provider-modes),
258+
> [Resource Provider modes](../../governance/policy/concepts/definition-structure.md#resource-provider-modes),
259259
> such as those for Azure Key Vault, provide information about compliance on the
260260
> [Component Compliance](../../governance/policy/how-to/get-compliance-data.md#component-compliance)
261261
> page.

articles/machine-learning/how-to-train-with-custom-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fastai_env.docker.base_dockerfile = "./Dockerfile"
101101
> Azure Machine Learning only supports Docker images that provide the following software:
102102
> * Ubuntu 18.04 or greater.
103103
> * Conda 4.7.# or greater.
104-
> * Python 3.6+.
104+
> * Python 3.7+.
105105
> * A POSIX compliant shell available at /bin/sh is required in any container image used for training.
106106
107107
For more information about creating and managing Azure Machine Learning environments, see [Create and use software environments](how-to-use-environments.md).

articles/machine-learning/v1/how-to-auto-train-image-models-v1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Automated ML supports model training for computer vision tasks like image classi
4545
* [Install the `automl` package yourself](https://github.com/Azure/azureml-examples/blob/main/v1/python-sdk/tutorials/automl-with-azureml/README.md#setup-using-a-local-conda-environment), which includes the [default installation](/python/api/overview/azure/ml/install#default-install) of the SDK.
4646

4747
> [!NOTE]
48-
> Only Python 3.6 and 3.7 are compatible with automated ML support for computer vision tasks.
48+
> Only Python 3.7 and 3.8 are compatible with automated ML support for computer vision tasks.
4949
5050
## Select your task type
5151
Automated ML for images supports the following task types:

articles/machine-learning/v1/how-to-deploy-inferencing-gpus.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ name: project_environment
147147
dependencies:
148148
# The Python interpreter version.
149149
# Currently Azure ML only supports 3.5.2 and later.
150-
- python=3.6.2
150+
- python=3.7
151151

152152
- pip:
153153
# You must list azureml-defaults as a pip dependency
@@ -292,4 +292,4 @@ aks_target.delete()
292292

293293
* [Deploy model on FPGA](how-to-deploy-fpga-web-service.md)
294294
* [Deploy model with ONNX](../concept-onnx.md#deploy-onnx-models-in-azure)
295-
* [Train TensorFlow DNN Models](../how-to-train-tensorflow.md)
295+
* [Train TensorFlow DNN Models](../how-to-train-tensorflow.md)

articles/machine-learning/v1/how-to-train-keras.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ First, define your conda dependencies in a YAML file; in this example the file i
140140
channels:
141141
- conda-forge
142142
dependencies:
143-
- python=3.6.2
143+
- python=3.7
144144
- pip:
145145
- azureml-defaults
146146
- tensorflow-gpu==2.0.0

articles/machine-learning/v1/how-to-train-pytorch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ First, define your conda dependencies in a YAML file; in this example the file i
167167
channels:
168168
- conda-forge
169169
dependencies:
170-
- python=3.6.2
170+
- python=3.7
171171
- pip=21.3.1
172172
- pip:
173173
- azureml-defaults

articles/machine-learning/v1/how-to-train-scikit-learn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ You can also create your own custom environment. Define your conda dependencies
8686

8787
```yaml
8888
dependencies:
89-
- python=3.6.2
89+
- python=3.7
9090
- scikit-learn
9191
- numpy
9292
- pip:

articles/machine-learning/v1/how-to-train-tensorflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ First, define your conda dependencies in a YAML file; in this example the file i
176176
channels:
177177
- conda-forge
178178
dependencies:
179-
- python=3.6.2
179+
- python=3.7
180180
- pip:
181181
- azureml-defaults
182182
- tensorflow-gpu==2.2.0

articles/machine-learning/v1/tutorial-1st-experiment-sdk-train.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ First you'll create a file with the package dependencies.
164164
- defaults
165165
- pytorch
166166
dependencies:
167-
- python=3.6.2
167+
- python=3.7
168168
- pytorch
169169
- torchvision
170170
```
@@ -357,7 +357,7 @@ channels:
357357
- defaults
358358
- pytorch
359359
dependencies:
360-
- python=3.6.2
360+
- python=3.7
361361
- pytorch
362362
- torchvision
363363
- pip

0 commit comments

Comments
 (0)