Skip to content

Commit eaec2e7

Browse files
authored
Merge pull request #113179 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents 58faa9f + e49bca4 commit eaec2e7

File tree

92 files changed

+2024
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2024
-810
lines changed

articles/active-directory/saas-apps/docusign-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ In this section, you'll grant B.Simon access to DocuSign so that this user can u
218218

219219
1. Copy the **Service Provider Assertion Consumer Service URL**, and then paste it into the **Reply URL** box in **Basic SAML Configuration** section in the Azure portal.
220220

221-
1. Copy the **Service Provider Login URL**, and then paste it into the **Sign On URL** box in **Basic SAML Configuration** section in the Azure portal.
221+
1. Copy the **Service Provider Login URL**, and then paste it into the **Sign On URL** box in **Basic SAML Configuration** section in the Azure portal. At the end of the **Service Provider Login URL** you will get the IDPID value.
222222

223223
1. Select **Close**.
224224

articles/active-directory/users-groups-roles/licensing-service-plan-reference.md

Lines changed: 11 additions & 10 deletions
Large diffs are not rendered by default.

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Both the horizontal pod autoscaler and cluster autoscaler can also decrease the
4040

4141
For more information about how the cluster autoscaler may be unable to scale down, see [What types of pods can prevent the cluster autoscaler from removing a node?][autoscaler-scaledown]
4242

43-
The cluster autoscaler uses startup parameters for things like time intervals between scale events and resource thresholds. These parameters are defined by the Azure platform, and aren't currently exposed for you to adjust. For more information on what parameters the cluster autoscaler uses, see [What are the cluster autoscaler parameters?][autoscaler-parameters].
43+
The cluster autoscaler uses startup parameters for things like time intervals between scale events and resource thresholds. For more information on what parameters the cluster autoscaler uses, see [What are the cluster autoscaler parameters?][autoscaler-parameters].
4444

4545
The cluster and horizontal pod autoscalers can work together, and are often both deployed in a cluster. When combined, the horizontal pod autoscaler is focused on running the number of pods required to meet application demand. The cluster autoscaler is focused on running the number of nodes required to support the scheduled pods.
4646

articles/automation/change-tracking-file-contents.md

Lines changed: 143 additions & 34 deletions
Large diffs are not rendered by default.

articles/automation/change-tracking.md

Lines changed: 109 additions & 213 deletions
Large diffs are not rendered by default.

articles/automation/graphical-runbook-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.topic: conceptual
1313

1414
## Prerequisites
1515

16-
Import the `Microsoft.Azure.Automation.GraphicalRunbook.Model` package into your project.
16+
Import the `Microsoft.Azure.Management.Automation.GraphicalRunbook.Model` package into your project.
1717

1818
## Create a runbook object instance
1919

articles/automation/python-packages.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Once a package has been imported, it's listed on the Python 2 packages page in y
2626

2727
## Import packages with dependencies
2828

29-
Azure automation doesn't resolve dependencies for python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
29+
Azure automation doesn't resolve dependencies for Python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
3030

3131
### Manually download
3232

33-
On a Windows 64-bit machine with [python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
33+
On a Windows 64-bit machine with [Python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
3434

3535
```cmd
3636
C:\Python27\Scripts\pip2.7.exe download -d <output dir> <package name>
@@ -40,7 +40,7 @@ Once the packages are downloaded, you can import them into your automation accou
4040

4141
### Runbook
4242

43-
Import the python runbook [Import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
43+
To obtain a runbook, [import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
4444

4545
* -s \<subscriptionId\>
4646
* -g \<resourceGroup\>
@@ -79,7 +79,7 @@ for group in groups:
7979

8080
## Develop and test runbooks offline
8181

82-
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
82+
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation Python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
8383

8484
## Next steps
8585

0 commit comments

Comments
 (0)