Skip to content

Commit 3d71fbc

Browse files
authored
Merge pull request #78500 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents ed9fe82 + e21e71d commit 3d71fbc

File tree

12 files changed

+63
-30
lines changed

12 files changed

+63
-30
lines changed

articles/active-directory/devices/troubleshoot-hybrid-join-windows-legacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ If the device was not hybrid Azure AD joined, you can attempt to do hybrid Azure
8585

8686
- Autoworkplace.exe is unable to silently authenticate with Azure AD or AD FS. This could be caused by missing or misconfigured AD FS (for federated domains) or missing or misconfigured Azure AD Seamless Single Sign-On (for managed domains) or network issues.
8787

88-
- It could be that multi-factor authentication (MFA) is enabled/configured for the user and WIAORMUTLIAUTHN is not configured at the AD FS server.
88+
- It could be that multi-factor authentication (MFA) is enabled/configured for the user and WIAORMULTIAUTHN is not configured at the AD FS server.
8989

9090
- Another possibility is that home realm discovery (HRD) page is waiting for user interaction, which prevents **autoworkplace.exe** from silently requesting a token.
9191

articles/active-directory/manage-apps/application-proxy-configure-single-sign-on-with-ping-access.md

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ To collect this information:
154154

155155
### Update GraphAPI to send custom fields (optional)
156156

157-
For a list of security tokens that Azure AD sends for authentication, see [Microsoft identity platform ID tokens](../develop/id-tokens.md). If you need a custom claim that sends other tokens, set the `acceptMappedClaims` application field to `True`. You can use Graph Explorer or the Azure AD portal's application manifest to make this change.
157+
If you need a custom claim that sends other tokens within the access_token consumed by PingAccess, set the `acceptMappedClaims` application field to `True`. You can use Graph Explorer or the Azure AD portal's application manifest to make this change.
158158

159-
This example uses Graph Explorer:
159+
**This example uses Graph Explorer:**
160160

161161
```
162162
PATCH https://graph.windows.net/myorganization/applications/<object_id_GUID_of_your_application>
@@ -166,7 +166,7 @@ PATCH https://graph.windows.net/myorganization/applications/<object_id_GUID_of_y
166166
}
167167
```
168168

169-
This example uses the [Azure Active Directory portal](https://aad.portal.azure.com/) to update the `acceptMappedClaims` field:
169+
**This example uses the [Azure Active Directory portal](https://aad.portal.azure.com/) to update the `acceptMappedClaims` field:**
170170

171171
1. Sign in to the [Azure Active Directory portal](https://aad.portal.azure.com/) as an application administrator.
172172
2. Select **Azure Active Directory** > **App registrations**. A list of applications appears.
@@ -175,7 +175,29 @@ This example uses the [Azure Active Directory portal](https://aad.portal.azure.c
175175
5. Search for the `acceptMappedClaims` field, and change the value to `True`.
176176
6. Select **Save**.
177177

178-
### Use a custom claim (optional)
178+
179+
### Use of optional claims (optional)
180+
Optional claims allows you to add standard-but-not-included-by-default claims that every user and tenant has.
181+
You can configure optional claims for your application by modifying the application manifest. For more info, see the [Understanding the Azure AD application manifest article](https://docs.microsoft.com/azure/active-directory/develop/reference-app-manifest/)
182+
183+
Example to include email address into the access_token that PingAccess will consume:
184+
```
185+
    "optionalClaims": {
186+
        "idToken": [],
187+
        "accessToken": [
188+
            {
189+
                "name": "email",
190+
                "source": null,
191+
                "essential": false,
192+
                "additionalProperties": []
193+
            }
194+
        ],
195+
        "saml2Token": []
196+
    },
197+
```
198+
199+
### Use of claims mapping policy (optional)
200+
[Claims Mapping Policy (preview)](https://docs.microsoft.com/azure/active-directory/develop/active-directory-claims-mapping#claims-mapping-policy-properties/) for attributes which do not exist in AzureAD. Claims mapping allows you to migrate old on-prem apps to the cloud by adding additional custom claims that are backed by your ADFS or user objects
179201

180202
To make your application use a custom claim and include additional fields, be sure you've also [created a custom claims mapping policy and assigned it to the application](../develop/active-directory-claims-mapping.md#claims-mapping-policy-assignment).
181203

@@ -184,6 +206,16 @@ To make your application use a custom claim and include additional fields, be su
184206
>
185207
> You can do policy definition and assignment through PowerShell, Azure AD Graph Explorer, or Microsoft Graph. If you're doing them in PowerShell, you may need to first use `New-AzureADPolicy` and then assign it to the application with `Add-AzureADServicePrincipalPolicy`. For more information, see [Claims mapping policy assignment](../develop/active-directory-claims-mapping.md#claims-mapping-policy-assignment).
186208
209+
Example:
210+
```powershell
211+
$pol = New-AzureADPolicy -Definition @('{"ClaimsMappingPolicy":{"Version":1,"IncludeBasicClaimSet":"true", "ClaimsSchema": [{"Source":"user","ID":"employeeid","JwtClaimType":"employeeid"}]}}') -DisplayName "AdditionalClaims" -Type "ClaimsMappingPolicy"
212+
213+
Add-AzureADServicePrincipalPolicy -Id "<<The object Id of the Enterprise Application you published in the previous step, which requires this claim>>" -RefObjectId $pol.Id
214+
```
215+
216+
### Enable PingAccess to use custom claims (optional but required if you expect the application to consume additional claims)
217+
When you will configure PingAccess in the following step, the Web Session you will create (Settings->Access->Web Sessions) must have **Request Profile** deselected and **Refresh User Attributes** set to **No**
218+
187219
## Download PingAccess and configure your application
188220

189221
Now that you've completed all the Azure Active Directory setup steps, you can move on to configuring PingAccess.

articles/automation/automation-update-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ Update
486486
| summarize hint.strategy=partitioned arg_max(TimeGenerated, UpdateState, Classification, Approved) by Computer, SourceComputerId, UpdateID
487487
| where UpdateState=~"Needed" and Approved!=false
488488
| summarize by UpdateID, Classification )
489-
| summarize allUpdatesCount=count(), criticalUpdatesCount=countif(Classification has "Critical"), securityUpdatesCount=countif(Classification has "Security"), otherUpdatesCount=countif(Classification !has "Critical" and Classification !has "Security"
489+
| summarize allUpdatesCount=count(), criticalUpdatesCount=countif(Classification has "Critical"), securityUpdatesCount=countif(Classification has "Security"), otherUpdatesCount=countif(Classification !has "Critical" and Classification !has "Security")
490490
```
491491

492492
##### Computers list

articles/azure-functions/functions-bindings-http-webhook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ If your function app is using [App Service Authentication / Authorization](../ap
662662

663663
You can also read this information from binding data. This capability is only available to the Functions 2.x runtime. It is also currently only available for .NET languages.
664664

665-
In .NET languages, this information is available as a [ClaimsPrincipal](https://docs.microsoft.com/dotnet/api/system.security.claims.claimsprincipal?view=netstandard-2.0). The ClaimsPrincipal is available as part of the request context as shown in the following example:
665+
In .NET languages, this information is available as a [ClaimsPrincipal](https://docs.microsoft.com/dotnet/api/system.security.claims.claimsprincipal). The ClaimsPrincipal is available as part of the request context as shown in the following example:
666666

667667
```csharp
668668
using System.Net;

articles/azure-monitor/app/api-custom-events-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ telemetry.trackEvent({name: "WinGame"});
148148

149149
The telemetry is available in the `customEvents` table in [Application Insights Analytics](analytics.md). Each row represents a call to `trackEvent(..)` in your app.
150150

151-
If [sampling](../../azure-monitor/app/sampling.md) is in operation, the itemCount property shows a value greater than 1. For example itemCount==10 means that of 10 calls to trackEvent(), the sampling process only transmitted one of them. To get a correct count of custom events, you should use therefore use code such as `customEvents | summarize sum(itemCount)`.
151+
If [sampling](../../azure-monitor/app/sampling.md) is in operation, the itemCount property shows a value greater than 1. For example itemCount==10 means that of 10 calls to trackEvent(), the sampling process only transmitted one of them. To get a correct count of custom events, you should therefore use code such as `customEvents | summarize sum(itemCount)`.
152152

153153
## GetMetric
154154

articles/azure-monitor/app/cloudservices.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,18 @@ For worker roles, you can track exceptions in two ways:
189189
## Performance counters
190190
The following counters are collected by default:
191191

192-
* \Process(??APP_WIN32_PROC??)\% Processor Time
193-
* \Memory\Available Bytes
194-
* \.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec
195-
* \Process(??APP_WIN32_PROC??)\Private Bytes
196-
* \Process(??APP_WIN32_PROC??)\IO Data Bytes/sec
197-
* \Processor(_Total)\% Processor Time
192+
* \Process(??APP_WIN32_PROC??)\% Processor Time
193+
* \Memory\Available Bytes
194+
* \.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec
195+
* \Process(??APP_WIN32_PROC??)\Private Bytes
196+
* \Process(??APP_WIN32_PROC??)\IO Data Bytes/sec
197+
* \Processor(_Total)\% Processor Time
198198

199199
For web roles, these counters are also collected:
200200

201-
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec
202-
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time
203-
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue
201+
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec
202+
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time
203+
* \ASP.NET Applications(??APP_W3SVC_PROC??)\Requests In Application Queue
204204

205205
You can specify additional custom or other Windows performance counters by editing *ApplicationInsights.config* [as shown in this example](https://github.com/Microsoft/ApplicationInsights-Home/blob/master/Samples/AzureEmailService/WorkerRoleA/ApplicationInsights.config#L14).
206206

articles/cognitive-services/Translator/language-support.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ The following languages are available for customization to or from English using
208208
| Bosnian (Latin) | `bs` |
209209
| Bulgarian | `bg` |
210210
| Chinese Simplified | `zh-Hans` |
211+
|Chinese Traditional| `zh-Hant` |
211212
| Croatian | `hr` |
212213
| Czech | `cs` |
213214
| Danish | `da` |

articles/machine-learning/team-data-science-process/sqldw-walkthrough.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,11 +579,11 @@ If you have already set up an AzureML workspace, you can directly upload the sam
579579

580580
In order to run the sample IPython Notebook or the Python script file, the following Python packages are needed. If you are using the AzureML IPython Notebook service, these packages have been pre-installed.
581581

582-
- pandas
583-
- numpy
584-
- matplotlib
585-
- pyodbc
586-
- PyTables
582+
- pandas
583+
- numpy
584+
- matplotlib
585+
- pyodbc
586+
- PyTables
587587

588588
The recommended sequence when building advanced analytical solutions on AzureML with large data is the following:
589589

articles/notebooks/tutorial-create-run-jupyter-notebook.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ If you see unexpected results (which you probably will!), check that each cell i
303303

304304
With two independent variables you can imagine a three-dimensional plot with a line fitted to the data. At three or more independent variables, however, it's no longer easy to visualize the fit, but you get the idea. In the end, it's all just mathematics, which a computer can handle easily without having to form a mental picture!
305305

306-
The regressor's `fit` method here creates the line, which algebraically is of the form `y = x*b1 + b0`, where b1 is the coefficient or slope of the line (which you can get to through `regressor.coef_`), and b0 is the intercept of the line at x=0 (which you can get to through `regressor.intercept`).
306+
The regressor's `fit` method here creates the line, which algebraically is of the form `y = x*b1 + b0`, where b1 is the coefficient or slope of the line (which you can get to through `regressor.coef_`), and b0 is the intercept of the line at x=0 (which you can get to through `regressor.intercept_`).
307307
```
308308
309309
1. Code cell; when run, this cell shows the output, `LinearRegression(copy_X=True, fit_intercept=True, n_jobs=None,normalize=False)`.
@@ -322,7 +322,7 @@ If you see unexpected results (which you probably will!), check that each cell i
322322
323323
With the regressor in hand, we can predict the test set results using its `predict` method. That method takes a vector of independent variables for which you want predictions.
324324
325-
Because the regressor is fit to the data by virtue of `coef_` and `intercept_` and `coef_`, a prediction is the result of `coef_ * x + intercept_`. (Indeed, `predict(0)` returns `intercept_` and `predict(1)` returns `intercept_ + coef_`.)
325+
Because the regressor is fit to the data by virtue of `coef_` and `intercept_`, a prediction is the result of `coef_ * x + intercept_`. (Indeed, `predict(0)` returns `intercept_` and `predict(1)` returns `intercept_ + coef_`.)
326326
327327
In the code, the `y_test` matrix (from when we split the set) contains the real observations. `y_pred` assigned here contains the predictions for the same `X_test` inputs. It's not expected that the test or training points exactly fit the regression; the regression is trying to find the model that we can use to make predictions with new observations of the independent variables.
328328
```

articles/site-recovery/site-recovery-retain-ip-azure-vm-failover.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here's the architecture before failover.
3838
- East Asia has a VNet (**Source VNet**) with address space 10.1.0.0/16.
3939
- East Asia has workloads split across three subnets in the VNet:
4040
- **Subnet 1**: 10.1.1.0/24
41-
- **Subnet 2**: 10.1.2.0/24,
41+
- **Subnet 2**: 10.1.2.0/24
4242
- **Subnet 3**: 10.1.3.0/24
4343
- Secondary (target) region is Azure Southeast Asia
4444
- Southeast Asia has a recovery VNet (**Recovery VNet**) identical to **Source VNet**.
@@ -128,11 +128,11 @@ Here’s what the network architecture looks like before failover.
128128
- East Asia has a VNet (**Source VNet**) with address space 10.1.0.0/16.
129129
- East Asia has workloads split across three subnets in **Source VNet**:
130130
- **Subnet 1**: 10.1.1.0/24
131-
- **Subnet 2**: 10.1.2.0/24,
132-
- **Subnet 3**: 10.1.3.0/24utilizing an Azure virtual network with address space 10.1.0.0/16. This virtual network is named **Source VNet**
131+
- **Subnet 2**: 10.1.2.0/24
132+
- **Subnet 3**: 10.1.3.0/24, utilizing an Azure virtual network with address space 10.1.0.0/16. This virtual network is named **Source VNet**
133133
- The secondary (target) region is Azure Southeast Asia:
134134
- Southeast Asia has a recovery VNet (**Recovery VNet**) identical to **Source VNet**.
135-
- VMs in East Asia are connected to an on-premises datacenter with Azure ExpressRoute or site-to-site-VPN.
135+
- VMs in East Asia are connected to an on-premises datacenter with Azure ExpressRoute or site-to-site VPN.
136136
- To reduce RTO, Company B provisions gateways on Recovery VNet in Azure Southeast Asia prior to failover.
137137
- Company B assigns/verifies target IP addresses for replicated VMs. The target IP address is the same as source IP address for each VM.
138138

0 commit comments

Comments
 (0)