Skip to content

Commit 8bd1b37

Browse files
authored
Merge pull request #176887 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 996076a + b111843 commit 8bd1b37

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

articles/active-directory/develop/scenario-web-app-call-api-app-configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Your web app will need to acquire a token for the downstream API. You specify it
104104
{
105105
// ...
106106
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
107-
.AddMicrosoftIdentityWebApp(Configuration, Configuration.GetSection("AzureAd"))
107+
.AddMicrosoftIdentityWebApp(Configuration, "AzureAd")
108108
.EnableTokenAcquisitionToCallDownstreamApi(new string[]{"user.read" })
109109
.AddInMemoryTokenCaches();
110110
// ...
@@ -134,7 +134,7 @@ If you want to call Microsoft Graph, *Microsoft.Identity.Web* enables you to dir
134134
{
135135
// ...
136136
services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
137-
.AddMicrosoftIdentityWebApp(Configuration, Configuration.GetSection("AzureAd"))
137+
.AddMicrosoftIdentityWebApp(Configuration, "AzureAd")
138138
.EnableTokenAcquisitionToCallDownstreamApi(new string[]{"user.read" })
139139
.AddMicrosoftGraph(Configuration.GetSection("GraphBeta"))
140140
.AddInMemoryTokenCaches();
@@ -540,4 +540,4 @@ def _build_msal_app(cache=None):
540540

541541
At this point, when the user signs in, a token is stored in the token cache. Let's see how it's then used in other parts of the web app.
542542

543-
[Remove accounts from the cache on global sign-out](scenario-web-app-call-api-sign-in.md)
543+
[Remove accounts from the cache on global sign-out](scenario-web-app-call-api-sign-in.md)

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ By bringing your devices to Azure AD, you maximize your users' productivity thro
2727

2828
If you have an on-premises Active Directory (AD) environment and you want to join your AD domain-joined computers to Azure AD, you can accomplish this by doing hybrid Azure AD join. This article provides you with the related steps to implement a hybrid Azure AD join in your environment.
2929

30+
> [!TIP]
31+
> SSO access to on-premises resources is also available to devices that are Azure AD joined. For more information, see [How SSO to on-premises resources works on Azure AD joined devices](azuread-join-sso.md).
32+
>
33+
3034
## Prerequisites
3135

3236
This article assumes that you are familiar with the [Introduction to device identity management in Azure Active Directory](./overview.md).

articles/baremetal-infrastructure/workloads/oracle/oracle-baremetal-patching.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Servers are delivered to customers with compatible versions. However, during OS/
1818
| --- | --- | --- | --- | --- |
1919
| Red Hat | RHEL 7.6 | 3.2.3i | 2.3.0.53 | 1.6.0.34 |
2020
| Red Hat | RHEL 7.6 | 4.1.1b | 2.3.0.53 | 1.6.0.34 |
21+
| Red Hat | RHEL 7.6 | 4.1.1b | 4.0.0.8 | 2.0.0.60 |
2122

2223
## Next steps
2324

articles/governance/policy/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@
396396
href: /answers/topics/azure-policy.html
397397
- name: Azure support ticket
398398
href: https://azure.microsoft.com/support/create-ticket/
399-
- name: UserVoice
400-
href: https://feedback.azure.com/forums/915958-azure-governance?category_id=345055
399+
- name: Azure Governance Ideas
400+
href: https://feedback.azure.com/d365community/forum/675ae472-f324-ec11-b6e6-000d3a4f0da0#
401401
- name: Videos
402402
items:
403403
- name: Governance YouTube Channel

articles/openshift/openshift-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ sections:
3131
answer: |
3232
The actual number of supported pods depends on an application’s memory, CPU, and storage requirements.
3333
34-
Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 100 compute node limit. This caps the maximum number of pods supported in a cluster to 250×100 = 25,000.
34+
Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 60 compute node limit. This caps the maximum number of pods supported in a cluster to 250×60 = 15,000.
3535
3636
Azure Red Hat OpenShift 3.11 has a 50 pod-per-node limit and a 20 compute node limit. This caps the maximum number of pods supported in a cluster to 50×20 = 1,000.
3737

articles/security/fundamentals/measured-boot-host-attestation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article describes how Microsoft ensures integrity and security of hosts thr
1515

1616
## Measured boot
1717

18-
The [Trusted Platform Module](/windows/security/information-protection/tpm/trusted-platform-module-top-node) (TPM) is a tamper-proof, cryptographically secure auditing component with firmware supplied by a trusted third party. The boot configuration log contains hash-chained measurements recorded in it's Platform Configuration Registers (PCR) when the host last underwent the bootstrapping sequence. The following figure shows this recording process. Incrementally adding a previously hashed measurement to the next measurement’s hash and running the hashing algorithm on the union accomplishes hash-chaining.
18+
The [Trusted Platform Module](/windows/security/information-protection/tpm/trusted-platform-module-top-node) (TPM) is a tamper-proof, cryptographically secure auditing component with firmware supplied by a trusted third party. The boot configuration log contains hash-chained measurements recorded in its Platform Configuration Registers (PCR) when the host last underwent the bootstrapping sequence. The following figure shows this recording process. Incrementally adding a previously hashed measurement to the next measurement’s hash and running the hashing algorithm on the union accomplishes hash-chaining.
1919

2020
![Diagram that shows Host Attestation Service hash-chaining.](./media/measured-boot-host-attestation/hash-chaining.png)
2121

@@ -54,4 +54,4 @@ To learn more about what we do to drive platform integrity and security, see:
5454
- [Secure boot](secure-boot.md)
5555
- [Project Cerberus](project-cerberus.md)
5656
- [Encryption at rest](encryption-atrest.md)
57-
- [Hypervisor security](hypervisor.md)
57+
- [Hypervisor security](hypervisor.md)

0 commit comments

Comments
 (0)