Skip to content

Commit 36de560

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-clarify-update
2 parents 8364606 + 9642b39 commit 36de560

15 files changed

+392
-216
lines changed

articles/applied-ai-services/form-recognizer/quickstarts/includes/v3-rest-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ In this quickstart you'll, use the Form Recognizer REST API to analyze and extra
2525
* [Mac or Linux](https://learn2torials.com/thread/how-to-install-curl-on-mac-or-linux-(ubuntu)-or-windows)
2626

2727
* **PowerShell version 7.*+** (or a similar command-line application.):
28-
* [Windows](/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.2&preserve-view=true)
29-
* [macOS](/powershell/scripting/install/installing-powershell-on-macos?view=powershell-7.2&preserve-view=true)
30-
* [Linux](/powershell/scripting/install/installing-powershell-on-linux?view=powershell-7.2&preserve-view=true)
28+
* [Windows](/powershell/scripting/install/installing-powershell-on-windows)
29+
* [macOS](/powershell/scripting/install/installing-powershell-on-macos)
30+
* [Linux](/powershell/scripting/install/installing-powershell-on-linux)
3131

3232
* To check your PowerShell version, type the following command relative to your operating system:
3333
* Windows: `Get-Host | Select-Object Version`

articles/automation/automation-runbook-types.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ Take into account the following considerations when determining which type to us
3131
PowerShell runbooks are based on Windows PowerShell. You directly edit the code of the runbook using the text editor in the Azure portal. You can also use any offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
3232

3333
The PowerShell version is determined by the **Runtime version** specified (that is version 7.2 (preview), 7.1 (preview) or 5.1). The Azure Automation service supports the latest PowerShell runtime.
34-
35-
The same Azure sandbox and Hybrid Runbook Worker can execute **PowerShell 5.1** and **PowerShell 7.1 (preview)** runbooks side by side.
34+
35+
The same Azure sandbox and Hybrid Runbook Worker can execute **PowerShell 5.1** and **PowerShell 7.1 (preview)** runbooks side by side.
3636

3737
> [!NOTE]
38-
> - Currently, PowerShell 7.2 (preview) runtime version is supported in five regions for Cloud jobs only: West Central US, East US, South Africa North, North Europe, Australia Southeast
39-
> - At the time of runbook execution, if you select **Runtime Version** as **7.1 (preview)**, PowerShell modules targeting 7.1 (preview) runtime version are used and if you select **Runtime Version** as **5.1**, PowerShell modules targeting 5.1 runtime version are used. This applies for PowerShell 7.2 (preview) modules and runbooks.
40-
38+
> - Currently, PowerShell 7.2 (preview) runtime version is supported in five regions for Cloud jobs only: West Central US, East US, South Africa North, North Europe, Australia Southeast
39+
> - At the time of runbook execution, if you select **Runtime Version** as **7.1 (preview)**, PowerShell modules targeting 7.1 (preview) runtime version are used and if you select **Runtime Version** as **5.1**, PowerShell modules targeting 5.1 runtime version are used. This applies for PowerShell 7.2 (preview) modules and runbooks.
40+
4141
Ensure that you select the right Runtime Version for modules.
4242

4343
For example : if you are executing a runbook for a SharePoint automation scenario in **Runtime version** *7.1 (preview)*, then import the module in **Runtime version** **7.1 (preview)**; if you are executing a runbook for a SharePoint automation scenario in **Runtime version** **5.1**, then import the module in **Runtime version** *5.1*. In this case, you would see two entries for the module, one for **Runtime Version** **7.1(preview)** and other for **5.1**.
@@ -80,27 +80,27 @@ The following are the current limitations and known issues with PowerShell runbo
8080
**Limitations**
8181

8282
- You must be familiar with PowerShell scripting.
83-
- The Azure Automation internal PowerShell cmdlets are not supported on a Linux Hybrid Runbook Worker. You must import the `automationassets` module at the beginning of your Python runbook to access the Automation account shared resources (assets) functions.
83+
- The Azure Automation internal PowerShell cmdlets are not supported on a Linux Hybrid Runbook Worker. You must import the `automationassets` module at the beginning of your Python runbook to access the Automation account shared resources (assets) functions.
8484
- For the PowerShell 7 runtime version, the module activities are not extracted for the imported modules.
8585
- *PSCredential* runbook parameter type is not supported in PowerShell 7 runtime version.
86-
- PowerShell 7.x does not support workflows. See [this](/powershell/scripting/whats-new/differences-from-windows-powershell?view=powershell-7.1#powershell-workflow&preserve-view=true) for more details.
86+
- PowerShell 7.x does not support workflows. See [this](/powershell/scripting/whats-new/differences-from-windows-powershell#powershell-workflow) for more details.
8787
- PowerShell 7.x currently does not support signed runbooks.
8888
- Source control integration doesn't support PowerShell 7.1 (preview) Also, PowerShell 7.1 (preview) runbooks in source control gets created in Automation account as Runtime 5.1.
8989

9090
**Known issues**
9191

92-
- Executing child scripts using `.\child-runbook.ps1` is not supported in this preview.
92+
- Executing child scripts using `.\child-runbook.ps1` is not supported in this preview.
9393
**Workaround**: Use `Start-AutomationRunbook` (internal cmdlet) or `Start-AzAutomationRunbook` (from *Az.Automation* module) to start another runbook from parent runbook.
94-
- Runbook properties defining logging preference is not supported in PowerShell 7 runtime.
94+
- Runbook properties defining logging preference is not supported in PowerShell 7 runtime.
9595
**Workaround**: Explicitly set the preference at the start of the runbook as below -
9696
```
9797
$VerbosePreference = "Continue"
9898
9999
$ProgressPreference = "Continue"
100100
```
101-
- Avoid importing `Az.Accounts` module to version 2.4.0 version for PowerShell 7 runtime as there can be an unexpected behavior using this version in Azure Automation.
101+
- Avoid importing `Az.Accounts` module to version 2.4.0 version for PowerShell 7 runtime as there can be an unexpected behavior using this version in Azure Automation.
102102
- You might encounter formatting problems with error output streams for the job running in PowerShell 7 runtime.
103-
- When you import a PowerShell 7.1 module thats dependent on other modules, you may find that the import button is gray even when PowerShell 7.1 version of the dependent module is installed. For example, Az.Compute version 4.20.0, has a dependency on Az.Accounts being >= 2.6.0. This issue occurs when an equivalent dependent module in PowerShell 5.1 doesn't meet the version requirements. For example, 5.1 version of Az.Accounts was < 2.6.0.
103+
- When you import a PowerShell 7.1 module that's dependent on other modules, you may find that the import button is gray even when PowerShell 7.1 version of the dependent module is installed. For example, Az.Compute version 4.20.0, has a dependency on Az.Accounts being >= 2.6.0. This issue occurs when an equivalent dependent module in PowerShell 5.1 doesn't meet the version requirements. For example, 5.1 version of Az.Accounts was < 2.6.0.
104104
- When you start PowerShell 7 runbook using the webhook, it auto-converts the webhook input parameter to an invalid JSON.
105105

106106

@@ -114,20 +114,20 @@ The following are the current limitations and known issues with PowerShell runbo
114114
- You must be familiar with PowerShell scripting.
115115
- For the PowerShell 7 runtime version, the module activities are not extracted for the imported modules.
116116
- *PSCredential* runbook parameter type is not supported in PowerShell 7 runtime version.
117-
- PowerShell 7.x does not support workflows. See [this](/powershell/scripting/whats-new/differences-from-windows-powershell?view=powershell-7.1#powershell-workflow&preserve-view=true) for more details.
117+
- PowerShell 7.x does not support workflows. See [this](/powershell/scripting/whats-new/differences-from-windows-powershell#powershell-workflow) for more details.
118118
- PowerShell 7.x currently does not support signed runbooks.
119119
- Source control integration doesn't support PowerShell 7.2 (preview). Also, PowerShell 7.2 (preview) runbooks in source control gets created in Automation account as Runtime 5.1.
120-
- Currently, only cloud jobs are supported for PowerShell 7.2 (preview) runtime versions.
121-
- Logging job operations to the Log Analytics workspace through linked workspace or diagnostics settings are not supported.
122-
- Currently, PowerShell 7.2 (preview) runbooks are only supported from Azure portal. Rest API and PowerShell is not supported.
120+
- Currently, only cloud jobs are supported for PowerShell 7.2 (preview) runtime versions.
121+
- Logging job operations to the Log Analytics workspace through linked workspace or diagnostics settings are not supported.
122+
- Currently, PowerShell 7.2 (preview) runbooks are only supported from Azure portal. Rest API and PowerShell is not supported.
123123
- Az module 8.3.0 is installed by default and cannot be managed at the automation account level. Use custom modules to override the Az module to the desired version.
124124
- The imported PowerShell 7.2 (preview) module would be validated during job execution. Ensure that all dependencies for the selected module are also imported for successful job execution.
125125

126126
**Known issues**
127127

128-
- Executing child scripts using `.\child-runbook.ps1` is not supported in this preview.
128+
- Executing child scripts using `.\child-runbook.ps1` is not supported in this preview.
129129
**Workaround**: Use `Start-AutomationRunbook` (internal cmdlet) or `Start-AzAutomationRunbook` (from *Az.Automation* module) to start another runbook from parent runbook.
130-
- Runbook properties defining logging preference is not supported in PowerShell 7 runtime.
130+
- Runbook properties defining logging preference is not supported in PowerShell 7 runtime.
131131
**Workaround**: Explicitly set the preference at the start of the runbook as below -
132132
```
133133
$VerbosePreference = "Continue"
@@ -138,7 +138,7 @@ The following are the current limitations and known issues with PowerShell runbo
138138

139139
## PowerShell Workflow runbooks
140140

141-
PowerShell Workflow runbooks are text runbooks based on [Windows PowerShell Workflow](automation-powershell-workflow.md). You directly edit the code of the runbook using the text editor in the Azure portal. You can also use any offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
141+
PowerShell Workflow runbooks are text runbooks based on [Windows PowerShell Workflow](automation-powershell-workflow.md). You directly edit the code of the runbook using the text editor in the Azure portal. You can also use any offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
142142

143143
> [!NOTE]
144144
> PowerShell 7.1 (preview) and PowerShell 7.2 (preview) do not support Workflow runbooks.
@@ -162,23 +162,23 @@ PowerShell Workflow runbooks are text runbooks based on [Windows PowerShell Work
162162

163163
Python runbooks compile under Python 2, Python 3.8 (preview) and Python 3.10 (preview). You can directly edit the code of the runbook using the text editor in the Azure portal. You can also use an offline text editor and [import the runbook](manage-runbooks.md) into Azure Automation.
164164

165-
* Python 3.10 (preview) runbooks are currently supported in five regions for cloud jobs only:
165+
* Python 3.10 (preview) runbooks are currently supported in five regions for cloud jobs only:
166166
- West Central US
167167
- East US
168168
- South Africa North
169169
- North Europe
170-
- Australia Southeast
170+
- Australia Southeast
171171

172172
### Advantages
173173

174174
> [!NOTE]
175175
> Importing a Python package may take several minutes.
176-
176+
177177
- Uses the robust Python libraries.
178178
- Can run in Azure or on Hybrid Runbook Workers.
179179
- For Python 2, Windows Hybrid Runbook Workers are supported with [python 2.7](https://www.python.org/downloads/release/latest/python2) installed.
180-
- For Python 3.8 (preview) Cloud Jobs, Python 3.8 (preview) version is supported. Scripts and packages from any 3.x version might work if the code is compatible across different versions.
181-
- For Python 3.8 (preview) Hybrid jobs on Windows machines, you can choose to install any 3.x version you may want to use.
180+
- For Python 3.8 (preview) Cloud Jobs, Python 3.8 (preview) version is supported. Scripts and packages from any 3.x version might work if the code is compatible across different versions.
181+
- For Python 3.8 (preview) Hybrid jobs on Windows machines, you can choose to install any 3.x version you may want to use.
182182
- For Python 3.8 (preview) Hybrid jobs on Linux machines, we depend on the Python 3 version installed on the machine to run DSC OMSConfig and the Linux Hybrid Worker. Different versions should work if there are no breaking changes in method signatures or contracts between versions of Python 3.
183183

184184

@@ -200,7 +200,7 @@ Following are the limitations of Python runbooks
200200
- You must be familiar with Python scripting.
201201
- For Python 3.8 (preview) modules, use wheel files targeting cp38-amd64.
202202
- To use third-party libraries, you must [import the packages](python-packages.md) into the Automation account.
203-
- Using **Start-AutomationRunbook** cmdlet in PowerShell/PowerShell Workflow to start a Python 3.8 (preview) runbook (preview) doesn't work. You can use **Start-AzAutomationRunbook** cmdlet from Az.Automation module or **Start-AzureRmAutomationRunbook** cmdlet from AzureRm.Automation module to work around this limitation. 
203+
- Using **Start-AutomationRunbook** cmdlet in PowerShell/PowerShell Workflow to start a Python 3.8 (preview) runbook (preview) doesn't work. You can use **Start-AzAutomationRunbook** cmdlet from Az.Automation module or **Start-AzureRmAutomationRunbook** cmdlet from AzureRm.Automation module to work around this limitation. 
204204
- Azure Automation doesn't support **sys.stderr**.
205205
- The Python **automationassets** package is not available on pypi.org, so it's not available for import onto a Windows machine.
206206

@@ -209,7 +209,7 @@ Following are the limitations of Python runbooks
209209
**Limitations**
210210

211211
- For Python 3.10 (preview) modules, currently, only the wheel files targeting cp310 Linux OS are supported. [Learn more](./python-3-packages.md)
212-
- Currently, only cloud jobs are supported for Python 3.10 (preview) runtime versions.
212+
- Currently, only cloud jobs are supported for Python 3.10 (preview) runtime versions.
213213
- Custom packages for Python 3.10 (preview) are only validated during job runtime. Job is expected to fail if the package is not compatible in the runtime or if required dependencies of packages are not imported into automation account.
214214
- Currently, Python 3.10 (preview) runbooks are only supported from Azure portal. Rest API and PowerShell is not supported.
215215

@@ -250,7 +250,7 @@ You can create and edit graphical and graphical PowerShell Workflow runbooks usi
250250

251251
* Can't create or edit outside the Azure portal.
252252
* Might require a code activity containing PowerShell code to execute complex logic.
253-
* Can't convert to one of the [text formats](automation-runbook-types.md), nor can you convert a text runbook to graphical format.
253+
* Can't convert to one of the [text formats](automation-runbook-types.md), nor can you convert a text runbook to graphical format.
254254
* Can't view or directly edit PowerShell code that the graphical workflow creates. You can view the code you create in any code activities.
255255
* Can't run runbooks on a Linux Hybrid Runbook Worker. See [Automate resources in your datacenter or cloud by using Hybrid Runbook Worker](automation-hybrid-runbook-worker.md).
256256
* Graphical runbooks can't be digitally signed.

articles/cognitive-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-csharp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ Create and assign persistent environment variables for your key and endpoint.
7979
# [Command Line](#tab/command-line)
8080

8181
```CMD
82-
setx ANOMALY_DETECTOR_API_KEY "REPLACE_WITH_YOUR_KEY_VALUE_HERE"
82+
setx ANOMALY_DETECTOR_API_KEY "REPLACE_WITH_YOUR_KEY_VALUE_HERE"
8383
```
8484

8585
```CMD
86-
setx ANOMALY_DETECTOR_ENDPOINT "REPLACE_WITH_YOUR_ENDPOINT_HERE"
86+
setx ANOMALY_DETECTOR_ENDPOINT "REPLACE_WITH_YOUR_ENDPOINT_HERE"
8787
```
8888

8989
# [PowerShell](#tab/powershell)
@@ -150,7 +150,7 @@ namespace anomaly_detector_quickstart
150150

151151
//read data
152152
//example: string datapath = @"c:\test\request-data.csv";
153-
string datapath = @"REPLACE_WITH_YOUR_LOCAL_SAMPLE_REQUEST_DATA_PATH";
153+
string datapath = @"REPLACE_WITH_YOUR_LOCAL_SAMPLE_REQUEST_DATA_PATH";
154154

155155
List<TimeSeriesPoint> list = File.ReadAllLines(datapath, Encoding.UTF8)
156156
.Where(e => e.Trim().Length != 0)
@@ -216,7 +216,7 @@ Next we call the client's `DetectEntireSeriesAsync` method with the `DetectReque
216216

217217
## Clean up resources
218218

219-
If you want to clean up and remove an Anomaly Detector resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it. You also may want to consider [deleting the environment variables](/powershell/module/microsoft.powershell.core/about/about_environment_variables?view=powershell-7.2#using-the-environment-provider-and-item-cmdlets&preserve-view=true) you created if you no longer intend to use them.
219+
If you want to clean up and remove an Anomaly Detector resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it. You also may want to consider [deleting the environment variables](/powershell/module/microsoft.powershell.core/about/about_environment_variables#using-the-environment-provider-and-item-cmdlets) you created if you no longer intend to use them.
220220

221221
* [Portal](../../../cognitive-services-apis-create-account.md#clean-up-resources)
222222
* [Azure CLI](../../../cognitive-services-apis-create-account-cli.md#clean-up-resources)

articles/cognitive-services/Anomaly-Detector/includes/quickstarts/anomaly-detector-client-library-javascript.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Anomaly Detector JavaScript client library quickstart
2+
title: Anomaly Detector JavaScript client library quickstart
33
titleSuffix: Azure Cognitive Services
44
services: cognitive-services
55
author: mrbullwinkle
@@ -78,11 +78,11 @@ Create and assign persistent environment variables for your key and endpoint.
7878
# [Command Line](#tab/command-line)
7979

8080
```CMD
81-
setx ANOMALY_DETECTOR_API_KEY "REPLACE_WITH_YOUR_KEY_VALUE_HERE"
81+
setx ANOMALY_DETECTOR_API_KEY "REPLACE_WITH_YOUR_KEY_VALUE_HERE"
8282
```
8383

8484
```CMD
85-
setx ANOMALY_DETECTOR_ENDPOINT "REPLACE_WITH_YOUR_ENDPOINT_HERE"
85+
setx ANOMALY_DETECTOR_ENDPOINT "REPLACE_WITH_YOUR_ENDPOINT_HERE"
8686
```
8787

8888
# [PowerShell](#tab/powershell)
@@ -211,7 +211,7 @@ In the code above, we call the Anomaly Detector API to detect anomalies through
211211

212212
## Clean up resources
213213

214-
If you want to clean up and remove an Anomaly Detector resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it. You also may want to consider [deleting the environment variables](/powershell/module/microsoft.powershell.core/about/about_environment_variables?view=powershell-7.2#using-the-environment-provider-and-item-cmdlets&preserve-view=true) you created if you no longer intend to use them.
214+
If you want to clean up and remove an Anomaly Detector resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it. You also may want to consider [deleting the environment variables](/powershell/module/microsoft.powershell.core/about/about_environment_variables#using-the-environment-provider-and-item-cmdlets) you created if you no longer intend to use them.
215215

216216
* [Portal](../../../cognitive-services-apis-create-account.md#clean-up-resources)
217217
* [Azure CLI](../../../cognitive-services-apis-create-account-cli.md#clean-up-resources)

0 commit comments

Comments
 (0)