Skip to content

Commit 84fb2a4

Browse files
authored
Merge pull request #227979 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 d648241 + 968107b commit 84fb2a4

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

articles/active-directory/governance/how-to-lifecycle-workflow-sync-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ For more attributes, see the [Workday attribute reference](../app-provisioning/w
7878

7979

8080
## Importance of time
81-
To ensure timing accuracy of scheduled workflows it’s curial to consider:
81+
To ensure timing accuracy of scheduled workflows it’s crucial to consider:
8282

8383
- The time portion of the attribute must be set accordingly, for example the `employeeHireDate` should have a time at the beginning of the day like 1AM or 5AM and the `employeeLeaveDateTime` should have time at the end of the day like 9PM or 11PM
8484
- The Workflows won't run earlier than the time specified in the attribute, however the [tenant schedule (default 3h)](customize-workflow-schedule.md) may delay the workflow run. For instance, if you set the `employeeHireDate` to 8AM but the tenant schedule doesn't run until 9AM, the workflow won't be processed until then. If a new hire is starting at 8AM, you would want to set the time to something like (start time - tenant schedule) to ensure it had run before the employee arrives.

articles/azure-monitor/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Azure Monitor collects and aggregates the data from every layer and component of
1616

1717
Azure Monitor also includes Azure Monitor SCOM Managed Instance, which allows you to move your on-premises System Center Operation Manager (Operations Manager) installation to the cloud in Azure.
1818

19-
Use Azure Monitor to monitor these types resources in Azure, other clouds, or on-premises:
19+
Use Azure Monitor to monitor these types of resources in Azure, other clouds, or on-premises:
2020
- Applications
2121
- Virtual machines
2222
- Guest operating systems
@@ -161,4 +161,4 @@ You may need to integrate Azure Monitor with other systems or to build custom so
161161
## Next steps
162162
- [Getting started with Azure Monitor](getting-started.md)
163163
- [Sources of monitoring data for Azure Monitor](data-sources.md)
164-
- [Data collection in Azure Monitor](essentials/data-collection.md)
164+
- [Data collection in Azure Monitor](essentials/data-collection.md)

articles/defender-for-cloud/azure-devops-extension.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ If you don't have access to install the extension, you must request access from
111111
displayName: 'Microsoft Security DevOps'
112112
```
113113
114+
> [!Note]
115+
> The MicrosoftSecurityDevOps build task depends on .NET 6. The CredScan analyzer depends on .NET 3.1. See more [here](https://marketplace.visualstudio.com/items?itemName=ms-securitydevops.microsoft-security-devops-azdevops).
116+
114117
1. Select **Save and run**.
115118
116119
1. To commit the pipeline, select **Save and run**.

articles/defender-for-cloud/github-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Security DevOps uses the following Open Source tools:
8787

8888
# Upload alerts to the Security tab
8989
- name: Upload alerts to Security tab
90-
uses: github/codeql-action/upload-sarif@v1
90+
uses: github/codeql-action/upload-sarif@v2
9191
with:
9292
sarif_file: ${{ steps.msdo.outputs.sarifFile }}
9393
```

articles/openshift/howto-add-update-pull-secret.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,19 @@ This section walks through updating that pull secret with additional values from
131131
Run the following command to update your pull secret.
132132

133133
> [!NOTE]
134-
> Running this command will cause your cluster nodes to restart one by one as they're updated.
134+
> In ARO 4.9 or older, running this command will cause your cluster nodes to restart one by one as they're updated.
135+
> In ARO 4.10 version or later a restart will not be triggered.
135136

136137
```console
137138
oc set data secret/pull-secret -n openshift-config --from-file=.dockerconfigjson=./pull-secret.json
138139
```
139140

141+
### Verify that pull secret is in place
142+
143+
```
144+
oc exec $(oc get pod -n openshift-apiserver -o jsonpath="{.items[0].metadata.name}") -- cat /var/lib/kubelet/config.json
145+
```
146+
140147
After the secret is set, you're ready to enable Red Hat Certified Operators.
141148

142149
### Modify the configuration files

articles/virtual-desktop/publish-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ To publish a built-in app:
3232
CommandLineSetting = '<Allow|Require|DoNotAllow>'
3333
IconIndex = '0'
3434
IconPath = '<IconPath>'
35-
howInPortal = $true
35+
ShowInPortal = $true
3636
}
3737
3838
New-AzWvdApplication @parameters
@@ -58,7 +58,7 @@ $parameters = @{
5858
CommandLineSetting = '<Allow|Require|DoNotAllow>'
5959
IconIndex = '0'
6060
IconPath = 'C:\Windows\SystemApps\Microsoft.MicrosoftEdge_8wekyb3d8bbwe\microsoftedge'
61-
howInPortal = $true
61+
ShowInPortal = $true
6262
}
6363
6464
New-AzWvdApplication @parameters

0 commit comments

Comments
 (0)