Skip to content

Commit 9e47bd0

Browse files
authored
Merge pull request #243961 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 0f5b214 + b983cf3 commit 9e47bd0

19 files changed

+238
-199
lines changed

articles/active-directory/develop/identity-platform-integration-checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Use the following checklist to ensure that your application is effectively integ
3737

3838
## Branding
3939

40-
![checkbox](./media/integration-checklist/checkbox-two.svg) Adhere to the [Branding guidelines for applications](howto-add-branding-in-azure-ad-apps.md).
40+
![checkbox](./media/integration-checklist/checkbox-two.svg) Adhere to the [Branding guidelines for applications](howto-add-branding-in-apps.md).
4141

4242
![checkbox](./media/integration-checklist/checkbox-two.svg) Provide a meaningful name and logo for your application. This information appears on your [application’s consent prompt](application-consent-experience.md). Make sure your name and logo are representative of your company/product so that users can make informed decisions. Ensure that you're not violating any trademarks.
4343

articles/active-directory/external-identities/one-time-passcode.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Email one-time passcode guest users can also use application endpoints that incl
3939

4040
You can also give email one-time passcode guest users a direct link to an application or resource by including your tenant information, for example `https://myapps.microsoft.com/signin/Twitter/<application ID?tenantId=<your tenant ID>`.
4141

42+
> [!NOTE]
43+
> Email one-time passcode guest users can sign in to Microsoft Teams directly from the common endpoint without choosing **Sign-in options**. During the sign-in process to Microsoft Teams, the guest user can select a link to send a one-time passcode.
44+
4245
## User experience for one-time passcode guest users
4346

4447
When the email one-time passcode feature is enabled, newly invited users [who meet certain conditions](#when-does-a-guest-user-get-a-one-time-passcode) will use one-time passcode authentication. Guest users who redeemed an invitation before email one-time passcode was enabled will continue to use their same authentication method.

articles/application-gateway/application-gateway-backend-health-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ To increase the timeout value, follow these steps:
113113
2. If you can resolve the IP address, there might be something wrong with the DNS configuration in the virtual network.
114114
3. Check whether the virtual network is configured with a custom DNS server. If it is, check the DNS server about why it can't resolve to the IP address of the specified FQDN.
115115
4. If you're using Azure default DNS, check with your domain name registrar about whether proper A record or CNAME record mapping has been completed.
116-
5. If the domain is private or internal, try to resolve it from a VM in the same virtual network. If you can resolve it, restart Application Gateway and check again. To restart Application Gateway, you need to [stop](/powershell/module/azurerm.network/stop-azurermapplicationgateway) and [start](/powershell/module/azurerm.network/start-azurermapplicationgateway) by using the PowerShell commands described in these linked resources.
116+
5. If the domain is private or internal, try to resolve it from a VM in the same virtual network. If you can resolve it, restart Application Gateway and check again. To restart Application Gateway, you need to [stop](/powershell/module/az.network/stop-azapplicationgateway) and [start](/powershell/module/az.network/start-azapplicationgateway) by using the PowerShell commands described in these linked resources.
117117

118118
### Updates to the DNS entries of the backend pool
119119

articles/application-gateway/application-gateway-troubleshooting-502.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ As we know enabling HTTPS in the "Backed HTTP Setting" of the rule will make the
216216
If the backend servers do not have a TLS certificate issued for the CNAME www.contoso.com or *.contoso.com, the request will fail with **Server Error: 502 - Web server received an invalid response while acting as a gateway or proxy server** because the upstream SSL certificate (the certificate installed on the backend servers) will not match the hostname in the host header, and hence the TLS negotiation will fail.
217217

218218

219-
www.contoso.com --> APP GW front end IP --> Listener with a rule that configures "Backend HTTP Settings" to use protocol HTTP --> Backend Pool --> Web server (needs to have a TLS certificate installed for www.contoso.com)
219+
www.contoso.com --> APP GW front end IP --> Listener with a rule that configures "Backend HTTP Settings" to use protocol HTTPS rather than HTTP --> Backend Pool --> Web server (needs to have a TLS certificate installed for www.contoso.com)
220220

221221
## Solution
222222

articles/application-gateway/http-response-codes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ For information about scenarios where 502 errors occur, and how to troubleshoot
124124

125125
Azure application Gateway V2 SKU sent HTTP 504 errors if the backend response time exceeds the time-out value which is configured in the Backend Setting.
126126

127+
IIS
128+
129+
If your backend server is IIS, see [Default Limits for Web Sites <limits>](/iis/configuration/system.applicationhost/sites/sitedefaults/limits#configuration) to set the timeout value. Refer to the `connectionTimeout` attribute for details. Ensure the connection timeout in IIS matches or does not exceed the timeout set in the backend setting.
130+
131+
nginx
132+
133+
If the backend server is nginx or nginx ingress controller, and if it has upstream servers, ensure the value of `nginx:proxy_read_timeout` matches or does not exceed with the timeout set in the backend setting.
134+
127135
## Next steps
128136

129137
If the information in this article doesn't help to resolve the issue, [submit a support ticket](https://azure.microsoft.com/support/options/).

articles/application-gateway/tutorial-multiple-sites-cli.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,21 +177,21 @@ In order to ensure that more specific rules are processed first, use the rule pr
177177
```azurecli-interactive
178178
az network application-gateway rule create \
179179
--gateway-name myAppGateway \
180-
--name wccontosoRule \
180+
--name contosoRule \
181181
--resource-group myResourceGroupAG \
182-
--http-listener wccontosoListener \
182+
--http-listener contosoListener \
183183
--rule-type Basic \
184184
--priority 200 \
185-
--address-pool wccontosoPool
185+
--address-pool contosoPool
186186
187187
az network application-gateway rule create \
188188
--gateway-name myAppGateway \
189-
--name shopcontosoRule \
189+
--name fabrikamRule \
190190
--resource-group myResourceGroupAG \
191-
--http-listener shopcontosoListener \
191+
--http-listener fabrikamListener \
192192
--rule-type Basic \
193193
--priority 100 \
194-
--address-pool shopcontosoPool
194+
--address-pool fabrikamPool
195195
196196
```
197197

@@ -221,7 +221,7 @@ for i in `seq 1 2`; do
221221
--instance-count 2 \
222222
--vnet-name myVNet \
223223
--subnet myBackendSubnet \
224-
--vm-sku Standard_DS2 \
224+
--vm-sku Standard_D1_v2 \
225225
--upgrade-policy-mode Automatic \
226226
--app-gateway myAppGateway \
227227
--backend-pool-name $poolName

articles/azure-maps/map-add-line-layer.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A line layer can be used to render `LineString` and `MultiLineString` features a
1515
> [!TIP]
1616
> Line layers by default will render the coordinates of polygons as well as lines in a data source. To limit the layer such that it only renders LineString features set the `filter` property of the layer to `['==', ['geometry-type'], 'LineString']` or `['any', ['==', ['geometry-type'], 'LineString'], ['==', ['geometry-type'], 'MultiLineString']]` if you want to include MultiLineString features as well.
1717
18-
The following code shows how to create a line. Add the line to a data source, then render it with a line layer using the [LineLayer](/javascript/api/azure-maps-control/atlas.layer.linelayer) class.
18+
The following code shows how to create a line. Add the line to a data source, then render it with a line layer using the [LineLayer] class.
1919

2020
```javascript
2121
//Create a data source and add it to the map.
@@ -41,11 +41,11 @@ The following screenshot shows a sample of the above functionality.
4141
</iframe>
4242
----------------------------------------------------------------------->
4343

44-
Line layers can be styled using [LineLayerOptions](/javascript/api/azure-maps-control/atlas.linelayeroptions) and [Use data-driven style expressions](data-driven-style-expressions-web-sdk.md).
44+
Line layers can be styled using [LineLayerOptions] and [Use data-driven style expressions].
4545

4646
## Add symbols along a line
4747

48-
The following sample demonstrates how to add arrow icons along a line on the map. When using a symbol layer, set the "placement" option to "line". This option will render the symbols along the line and rotate the icons (0 degrees = right).
48+
The following sample demonstrates how to add arrow icons along a line on the map. When using a symbol layer, set the `placement` option to `line`. This option renders the symbols along the line and rotates the icons (0 degrees = right).
4949

5050
```javascript
5151
function InitMap()
@@ -121,7 +121,7 @@ function InitMap()
121121
}
122122
```
123123

124-
This code will create a map that appears as follows:
124+
This code creates a map that appears as follows:
125125

126126
:::image type="content" source="./media/map-add-line-layer/add-symbols-along-a-line.png"alt-text="A screenshot showing a line layer on an Azure Maps map with arrow symbols along the line.":::
127127

@@ -133,7 +133,7 @@ This code will create a map that appears as follows:
133133
----------------------------------------------------------------------->
134134

135135
> [!TIP]
136-
> The Azure Maps web SDK provides several customizable image templates you can use with the symbol layer. For more information, see the [How to use image templates](how-to-use-image-templates-web-sdk.md) document.
136+
> The Azure Maps web SDK provides several customizable image templates you can use with the symbol layer. For more information, see the [How to use image templates] document.
137137
138138
<a name="line-stroke-gradient"></a>
139139

@@ -168,31 +168,37 @@ The Line layer has several styling options. For a fully functional sample that i
168168
Learn more about the classes and methods used in this article:
169169

170170
> [!div class="nextstepaction"]
171-
> [LineLayer](/javascript/api/azure-maps-control/atlas.layer.linelayer)
171+
> [LineLayer]
172172
173173
> [!div class="nextstepaction"]
174-
> [LineLayerOptions](/javascript/api/azure-maps-control/atlas.linelayeroptions)
174+
> [LineLayerOptions]
175175
176176
See the following articles for more code samples to add to your maps:
177177

178178
> [!div class="nextstepaction"]
179-
> [Create a data source](create-data-source-web-sdk.md)
179+
> [Create a data source]
180180
181181
> [!div class="nextstepaction"]
182-
> [Add a popup](map-add-popup.md)
182+
> [Add a popup]
183183
184184
> [!div class="nextstepaction"]
185-
> [Use data-driven style expressions](data-driven-style-expressions-web-sdk.md)
185+
> [Use data-driven style expressions]
186186
187187
> [!div class="nextstepaction"]
188-
> [How to use image templates](how-to-use-image-templates-web-sdk.md)
188+
> [How to use image templates]
189189
190190
> [!div class="nextstepaction"]
191-
> [Add a polygon layer](map-add-shape.md)
191+
> [Add a polygon layer]
192192
193-
[Line with Stroke Gradient]: https://samples.azuremaps.com/line-layer/line-with-stroke-gradient
193+
[Add a polygon layer]: map-add-shape.md
194+
[Add a popup]: map-add-popup.md
194195
[Azure Maps Samples]: https://samples.azuremaps.com
196+
[Create a data source]: create-data-source-web-sdk.md
197+
[How to use image templates]: how-to-use-image-templates-web-sdk.md
198+
[Line Layer Options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Line%20Layer/Line%20Layer%20Options/Line%20Layer%20Options.html
195199
[Line Layer Options]: https://samples.azuremaps.com/line-layer/line-layer-options
196-
197200
[Line with Stroke Gradient source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Line%20Layer/Line%20with%20Stroke%20Gradient/Line%20with%20Stroke%20Gradient.html
198-
[Line Layer Options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Line%20Layer/Line%20Layer%20Options/Line%20Layer%20Options.html
201+
[Line with Stroke Gradient]: https://samples.azuremaps.com/line-layer/line-with-stroke-gradient
202+
[LineLayer]: /javascript/api/azure-maps-control/atlas.layer.linelayer
203+
[LineLayerOptions]: /javascript/api/azure-maps-control/atlas.linelayeroptions
204+
[Use data-driven style expressions]: data-driven-style-expressions-web-sdk.md

articles/azure-maps/map-add-pin.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The maps image sprite manager loads custom images used by the symbol layer. It s
2929

3030
Before you can add a symbol layer to the map, you need to take a couple of steps. First, create a data source, and add it to the map. Create a symbol layer. Then, pass in the data source to the symbol layer, to retrieve the data from the data source. Finally, add data into the data source, so that there's something to be rendered.
3131

32-
The code below demonstrates what should be added to the map after it has loaded. This sample renders a single point on the map using a symbol layer.
32+
The following code demonstrates what should be added to the map after it has loaded. This sample renders a single point on the map using a symbol layer.
3333

3434
```javascript
3535
//Create a data source and add it to the map.
@@ -166,7 +166,7 @@ function InitMap()
166166
------------------------------------->
167167

168168
> [!TIP]
169-
> The Azure Maps web SDK provides several customizable image templates you can use with the symbol layer. For more information, see the [How to use image templates](how-to-use-image-templates-web-sdk.md) document.
169+
> The Azure Maps web SDK provides several customizable image templates you can use with the symbol layer. For more information, see the [How to use image templates] document.
170170
171171
## Customize a symbol layer
172172

@@ -210,7 +210,7 @@ See the following articles for more code samples to add to your maps:
210210
> [Use data-driven style expressions](data-driven-style-expressions-web-sdk.md)
211211
212212
> [!div class="nextstepaction"]
213-
> [How to use image templates](how-to-use-image-templates-web-sdk.md)
213+
> [How to use image templates]
214214
215215
> [!div class="nextstepaction"]
216216
> [Add a line layer](map-add-line-layer.md)
@@ -226,3 +226,4 @@ See the following articles for more code samples to add to your maps:
226226
227227
[Symbol Layer Options]: https://samples.azuremaps.com/?search=symbol%20layer&sample=symbol-layer-options
228228
[Symbol Layer Options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Symbol%20Layer/Symbol%20Layer%20Options/Symbol%20Layer%20Options.html
229+
[How to use image templates]: how-to-use-image-templates-web-sdk.md

0 commit comments

Comments
 (0)