Skip to content

Commit 1b670b7

Browse files
authored
Merge pull request #192871 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 1497627 + c204927 commit 1b670b7

File tree

9 files changed

+23
-22
lines changed

9 files changed

+23
-22
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ Passwords aren't written back in any of the following situations:
156156
> [!WARNING]
157157
> Use of the checkbox "User must change password at next logon" in on-premises AD DS administrative tools like Active Directory Users and Computers or the Active Directory Administrative Center is supported as a preview feature of Azure AD Connect. For more information, see [Implement password hash synchronization with Azure AD Connect sync](../hybrid/how-to-connect-password-hash-synchronization.md).
158158
159+
> [!NOTE]
160+
> If a user has the option "Password never expires" set in Active Directory (AD), the force password change flag will not be set in Active Directory (AD), so the user will not be prompted to change the password during the next sign-in even if the option to force the user to change their password on next logon option is selected during an administrator-initiated end-user password reset.
161+
159162
## Next steps
160163

161164
To get started with SSPR writeback, complete the following tutorial:

articles/security/fundamentals/services-technologies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Over time, this list will change and grow, just as Azure does. Make sure to chec
2828
## General Azure security
2929
|Service|Description|
3030
|--------|--------|
31-
|[Azure Security Center](../../security-center/security-center-introduction.md)| A cloud workload protection solution that provides security management and advanced threat protection across hybrid cloud workloads.|
31+
|[Microsoft Defender for Cloud](../../security-center/security-center-introduction.md)| A cloud workload protection solution that provides security management and advanced threat protection across hybrid cloud workloads.|
3232
|[Azure Key Vault](../../key-vault/general/overview.md)| A secure secrets store for the passwords, connection strings, and other information you need to keep your apps working. |
3333
|[Azure Monitor logs](../../azure-monitor/logs/log-query-overview.md)|A monitoring service that collects telemetry and other data, and provides a query language and analytics engine to deliver operational insights for your apps and resources. Can be used alone or with other services such as Defender for Cloud. |
3434
|[Azure Dev/Test Labs](../../devtest-labs/devtest-lab-overview.md)|A service that helps developers and testers quickly create environments in Azure while minimizing waste and controlling cost. |

articles/service-fabric/service-fabric-package-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The folders are named to match the **Name** attributes of each corresponding ele
4141

4242
Typical scenarios for using **SetupEntryPoint** are when you need to run an executable before the service starts or you need to perform an operation with elevated privileges. For example:
4343

44-
* Setting up and initializing environment variables that the service executable needs. It is not limited to only executables written via the Service Fabric programming models. For example, npm.exe needs some environment variables configured for deploying a node.js application.
44+
* Setting up and initializing environment variables that the service executable needs. It is not limited to only executables written via the Service Fabric programming models. For example, npm.exe needs some environment variables configured for deploying a Node.js application.
4545
* Setting up access control by installing security certificates.
4646

4747
For more information on how to configure the **SetupEntryPoint**, see [Configure the policy for a service setup entry point](service-fabric-application-runas-security.md)

articles/stream-analytics/debug-user-defined-functions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ exports.data = methods;
8181
8282
## Install debug support
8383

84-
To debug, you must [download](https://nodejs.org/en/download/) and install **node.js**. Install the correct version according to the platform you're using. After you install the node.js runtime, restart Visual Studio Code to implement the changes.
84+
To debug, you must [download](https://nodejs.org/en/download/) and install **node.js**. Install the correct version according to the platform you're using. After you install the Node.js runtime, restart Visual Studio Code to implement the changes.
8585

86-
Select **Run and Debug** or press **CTRL + SHIFT + D** to start debugging. A combo box appears where you can select **node.js** as the runtime. If you only have node.js installed, it is used by default. You should be able to step through the code and into the satellite file if needed with F11.
86+
Select **Run and Debug** or press **CTRL + SHIFT + D** to start debugging. A combo box appears where you can select **node.js** as the runtime. If you only have Node.js installed, it is used by default. You should be able to step through the code and into the satellite file if needed with F11.
8787

8888
> [!div class="mx-imgBorder"]
8989
> ![Stream Analytics run and debug udf](./media/debug-user-defined-functions/run-debug-udf.png)
@@ -116,7 +116,7 @@ exports.data = methods;
116116
> [!div class="mx-imgBorder"]
117117
> ![Code added to UDA](./media/debug-user-defined-functions/uda-expose-methods.png)
118118
119-
Select **Run and Debug** or press **CTRL + SHIFT + D** to start debugging. A combo box appears where you can select **node.js** as the runtime. If you only have node.js installed, it is used by default. You should be able to step through the code and into the satellite file if needed with F11.
119+
Select **Run and Debug** or press **CTRL + SHIFT + D** to start debugging. A combo box appears where you can select **node.js** as the runtime. If you only have Node.js installed, it is used by default. You should be able to step through the code and into the satellite file if needed with F11.
120120

121121
> [!div class="mx-imgBorder"]
122122
> ![Stream Analytics run and debug uda](./media/debug-user-defined-functions/run-debug-uda.png)

articles/synapse-analytics/spark/apache-spark-azure-machine-learning-tutorial.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,14 @@ In Azure Machine Learning, a workspace is a class that accepts your Azure subscr
125125
```python
126126
from azureml.core import Workspace
127127

128-
# Enter your workspace subscription, resource group, name, and region.
128+
# Enter your subscription id, resource group, and workspace name.
129129
subscription_id = "<enter your subscription ID>" #you should be owner or contributor
130130
resource_group = "<enter your resource group>" #you should be owner or contributor
131131
workspace_name = "<enter your workspace name>" #your workspace name
132-
workspace_region = "<enter workspace region>" #your region
133132

134133
ws = Workspace(workspace_name = workspace_name,
135134
subscription_id = subscription_id,
136135
resource_group = resource_group)
137-
138136
```
139137

140138
## Convert a DataFrame to an Azure Machine Learning dataset
@@ -320,11 +318,11 @@ After you've validated your best model, you can register it to Azure Machine Lea
320318
```python
321319
description = 'My automated ML model'
322320
model_path='outputs/model.pkl'
323-
model = best_run.register_model(model_name = 'NYCGreenTaxiModel', model_path = model_path, description = description)
321+
model = best_run.register_model(model_name = 'NYCYellowTaxiModel', model_path = model_path, description = description)
324322
print(model.name, model.version)
325323
```
326324
```Output
327-
NYCGreenTaxiModel 1
325+
NYCYellowTaxiModel 1
328326
```
329327
## View results in Azure Machine Learning
330328
You can also access the results of the iterations by going to the experiment in your Azure Machine Learning workspace. Here, you can get additional details on the status of your run, attempted models, and other model metrics.
@@ -333,4 +331,4 @@ You can also access the results of the iterations by going to the experiment in
333331

334332
## Next steps
335333
- [Azure Synapse Analytics](../index.yml)
336-
- [Tutorial: Build a machine learning app with Apache Spark MLlib and Azure Synapse Analytics](./apache-spark-machine-learning-mllib-notebook.md)
334+
- [Tutorial: Build a machine learning app with Apache Spark MLlib and Azure Synapse Analytics](./apache-spark-machine-learning-mllib-notebook.md)

articles/synapse-analytics/spark/apache-spark-custom-conda-channel.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ mkdir -P channel/linux64
8181
<Add all .tar.bz2 from https://repo.anaconda.com/pkgs/main/linux-64/>
8282
// Note: Add all dependent .tar.bz2 as well
8383
84-
cd channel1
84+
cd channel
8585
mkdir noarch
8686
echo '{}' > noarch/repodata.json
8787
bzip2 -k noarch/repodata.json
@@ -121,7 +121,7 @@ dependencies:
121121
Once you've created the sample Conda file, you can create a virtual Conda environment. You can verify this locally by running the following commands:
122122

123123
```
124-
conda env create file sample.yml
124+
conda env create --file sample.yml
125125
source activate env
126126
conda list
127127
```

articles/virtual-machines/linux/azure-hybrid-benefit-byos-linux.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.author: mathapli
2323
>Azure Hybrid Benefit for BYOS VMs is planned for Preview from **30 March 2022**. You can [sign up for the preview here.](https://aka.ms/ahb-linux-form) You will receive a mail from Microsoft once your subscriptions are enabled for Preview.
2424
2525

26-
Azure Hybrid Benefit for BYOS VMs is a licensing benefit that helps you to get software updates and integrated support for Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) directly from Azure infrastructure. This benefit is available to RHEL and SLES custom on-prem image VMs (VMs generated from o- prem images), and to RHEL and SLES Marketplace bring-your-own-subscription (BYOS) VMs.
26+
Azure Hybrid Benefit for BYOS VMs is a licensing benefit that helps you to get software updates and integrated support for Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) directly from Azure infrastructure. This benefit is available to RHEL and SLES custom on-prem image VMs (VMs generated from on-prem images), and to RHEL and SLES Marketplace bring-your-own-subscription (BYOS) VMs.
2727

2828
## Benefit description
2929
Before AHB BYOS, RHEL and SLES customers who migrated their on-prem machines to Azure by creating images of on-prem systems and migrating them as VMs on Azure did not have the flexibility to get software updates directly from Azure similar to Marketplace PAYG VMs. Hence, you needed to still buy cloud access licenses from the Enterprise Linux distributors to get security support as well as software updates. With Azure Hybrid Benefit for BYOS VMs, we will allow you to get software updates and support for on-prem custom image VMs as well as RHEL and SLES BYOS VMs similar to PAYG VMs by paying the same software fees as charged to PAYG VMs. In addition, these conversions can happen without any redeployment, so you can avoid any downtime risk.
@@ -87,7 +87,7 @@ To start using the benefit for SUSE:
8787

8888
1. Wait for 5 minutes for the extension to read the license type value and install the repositories.
8989

90-
1. You should now be connected to Azure SLES Update Infrastructure and the relevant repositories will be installed in your machine.
90+
1. You should now be connected to the SUSE Public Cloud Update Infrastructure on Azure and the relevant repositories will be installed in your machine.
9191

9292
1. In case the extension is not running by itself, you can run it on demand as well.
9393

@@ -140,7 +140,7 @@ you can use the `az vm update` command to update existing license type on runnin
140140
## Enable and disable the benefit for SLES
141141
142142
You can install the `AHBForSLES` extension to install the extension. After successfully installing the extension,
143-
you can use the `az vm update` command to update existing license type on running VMs. For SLES VMs, run the command and set `--license-type` parameter to one of the following: `SLES_STANDARD`,`SLES_SAP` or `SLES_HPC`.
143+
you can use the `az vm update` command to update existing license type on running VMs. For SLES VMs, run the command and set `--license-type` parameter to one of the following: `SLES_STANDARD`, `SLES_SAP` or `SLES_HPC`.
144144
145145
### CLI example to enable the benefit for SLES
146146
1. Install the Azure Hybrid Benefit extension on running VM using the portal or via Azure CLI using the command below:
@@ -162,7 +162,7 @@ you can use the `az vm update` command to update existing license type on runnin
162162
```
163163
1. Wait for 5 minutes for the extension to read the license type value and install the repositories.
164164
165-
1. You should now be connected to Azure SLES Update Infrastructure and the relevant repositories will be installed in your machine. You can check the same by performing the command below on your VM which outputs installed repository packages on your VM:
165+
1. You should now be connected to the SUSE Public Cloud Update Infrastructure on Azure and the relevant repositories will be installed in your machine. You can verify this by performing the command below on your VM which list SUSE repositories on your VM:
166166
```bash
167167
zypper repos
168168
```
@@ -182,7 +182,7 @@ To check the status of Azure Hybrid Benefit for BYOS VM status
182182
1. You can view the Azure Hybrid Benefit status of a VM by using the Azure CLI or by using Azure Instance Metadata Service.
183183
184184
You can use the below command for this purpose. Look for a `licenseType` field in the response. If the `licenseType` field exists and the value is one of the below, your VM has the benefit enabled:
185-
`RHEL_BASE`, `RHEL_EUS`, `RHEL_BASESAPAPPS`, `RHEL_SAPHA`, `RHEL_BASESAPAPPS`, `RHEL_BASESAPHA`, `SLES_STANDARD`, `SLES_SAP`, `SLES_`
185+
`RHEL_BASE`, `RHEL_EUS`, `RHEL_BASESAPAPPS`, `RHEL_SAPHA`, `RHEL_BASESAPAPPS`, `RHEL_BASESAPHA`, `SLES_STANDARD`, `SLES_SAP`, `SLES_HPC`.
186186
187187
```azurecli
188188
az vm get-instance-view -g MyResourceGroup -n MyVm

articles/virtual-network/virtual-networks-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ Virtual networks and subnets span all availability zones in a region. You don't
7575

7676
## Pricing
7777

78-
There is no charge for using Azure VNet, it is free of cost. Standard charges are applicable for resources, such as Virtual Machines (VMs) and other products. To learn more, see [VNet pricing](https://azure.microsoft.com/pricing/details/virtual-network/) and the Azure [pricing calculator](https://azure.microsoft.com/pricing/calculator/).
78+
There is no charge for using Azure VNet; it is free of cost. Standard charges are applicable for resources, such as Virtual Machines (VMs) and other products. To learn more, see [VNet pricing](https://azure.microsoft.com/pricing/details/virtual-network/) and the Azure [pricing calculator](https://azure.microsoft.com/pricing/calculator/).
7979

8080
## Next steps
81-
- Learn about [Azure Virtual Network concepts and best practices](concepts-and-best-practices.md) .
82-
- To get started using a virtual network, create one, deploy a few VMs to it, and communicate between the VMs. To learn how, see the [Create a virtual network](quick-create-portal.md) quickstart.
81+
- Learn about [Azure Virtual Network concepts and best practices](concepts-and-best-practices.md).
82+
- To get started using a virtual network, create one, deploy a few VMs to it, and communicate between the VMs. To learn how, see the [Create a virtual network](quick-create-portal.md) quickstart.

includes/iot-hub-get-started-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms.topic: include
66
ms.date: 10/26/2018
77
---
88
> [!NOTE]
9-
> Before you start this tutorial, complete the [Raspberry Pi online simulator](../articles/iot-hub/iot-hub-raspberry-pi-web-simulator-get-started.md) tutorial or one of the device tutorials. For example, you can go to [Raspberry Pi with node.js](../articles/iot-hub/iot-hub-raspberry-pi-kit-node-get-started.md) or to one of the [Send telemetry](../articles/iot-develop/quickstart-send-telemetry-iot-hub.md?pivots=programming-language-csharp) quickstarts. In these articles, you set up your Azure IoT device and IoT hub, and you deploy a sample application to run on your device. The application sends collected sensor data to your IoT hub.
9+
> Before you start this tutorial, complete the [Raspberry Pi online simulator](../articles/iot-hub/iot-hub-raspberry-pi-web-simulator-get-started.md) tutorial or one of the device tutorials. For example, you can go to [Raspberry Pi with Node.js](../articles/iot-hub/iot-hub-raspberry-pi-kit-node-get-started.md) or to one of the [Send telemetry](../articles/iot-develop/quickstart-send-telemetry-iot-hub.md?pivots=programming-language-csharp) quickstarts. In these articles, you set up your Azure IoT device and IoT hub, and you deploy a sample application to run on your device. The application sends collected sensor data to your IoT hub.

0 commit comments

Comments
 (0)