Merge pull request #239472 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 18d51a4df1c3 · 2023-05-30T09:57:41.000-07:00
Resolve syncing conflicts from repo_sync_working_branch to main
diff --git a/articles/active-directory-b2c/claimsschema.md b/articles/active-directory-b2c/claimsschema.md
@@ -68,7 +68,7 @@ The **DataType** element supports the following values:
 |boolean|Represents a Boolean (`true` or `false`) value.|
 |date| Represents an instant in time, typically expressed as a date of a day. The value of the date follows ISO 8601 convention.|
 |dateTime|Represents an instant in time, typically expressed as a date and time of day. The value of the date follows ISO 8601 convention during runtime and is converted to UNIX epoch time when issued as a claim into the token.|
-|duration|Represents a time interval in years, months, days, hours, minutes, and seconds. The format of is `PnYnMnDTnHnMnS`, where `P` indicates positive, or `N` for negative value. `nY` is the number of years followed by a literal `Y`. `nMo` is the number of months followed by a literal `Mo`. `nD` is the number of days followed by a literal `D`. Examples: `P21Y` represents 21 years. `P1Y2Mo` represents one year, and two months. `P1Y2Mo5D` represents one year, two months, and five days.  `P1Y2M5DT8H5M620S` represents one year, two months, five days, eight hours, five minutes, and twenty seconds.  |
+|duration|Represents a time interval in years, months, days, hours, minutes, and seconds. The format of is `PnYnMnDTnHnMnS`, where `P` indicates positive, or `N` for negative value. `nY` is the number of years followed by a literal `Y`. `nMo` is the number of months followed by a literal `Mo`. `nD` is the number of days followed by a literal `D`. Examples: `P21Y` represents 21 years. `P1Y2Mo` represents one year, and two months. `P1Y2Mo5D` represents one year, two months, and five days.  `P1Y2M5DT8H5M20S` represents one year, two months, five days, eight hours, five minutes, and twenty seconds.  |
 |phoneNumber|Represents a phone number. |
 |int| Represents number between -2,147,483,648 and 2,147,483,647|
 |long| Represents number between -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807 |
@@ -251,7 +251,7 @@ The **UserInputType** element available user input types:
 |Password | `string` |Password text box.|
 |RadioSingleSelect |`string` | Collection of radio buttons. The claim value is the selected value.|
 |Readonly | `boolean`, `date`, `dateTime`, `duration`, `int`, `long`, `string`| Read-only text box. |
-|TextBox |`boolean`, `int`, `string` |Single-line text box. |
+|TextBox |`boolean`, `int`, `phoneNumber`, `string` |Single-line text box. |
 
 
 #### TextBox
diff --git a/articles/active-directory-b2c/embedded-login.md b/articles/active-directory-b2c/embedded-login.md
@@ -73,6 +73,7 @@ The **Sources** attribute contains the URI of your web application. Add a space
 - The URI must be trusted and owned by your application.
 - The URI must use the https scheme.  
 - The full URI of the web app must be specified. Wildcards are not supported.
+- The **JourneyFraming** element only allows site URLs with a **two to seven-character** Top-level domain (TLD) to align with commonly recognized TLDs.
 
 In addition, we recommend that you also block your own domain name from being embedded in an iframe by setting the `Content-Security-Policy` and `X-Frame-Options` headers respectively on your application pages. This will mitigate security concerns around older browsers related to nested embedding of iframes.
 
diff --git a/articles/active-directory-b2c/enable-authentication-angular-spa-app.md b/articles/active-directory-b2c/enable-authentication-angular-spa-app.md
@@ -107,7 +107,7 @@ export const b2cPolicies = {
 export const msalConfig: Configuration = {
      auth: {
          clientId: '<your-MyApp-application-ID>',
-         authority: b2cPolicies.authorities.signUpSignIn,
+         authority: b2cPolicies.authorities.signUpSignIn.authority,
          knownAuthorities: [b2cPolicies.authorityDomain],
          redirectUri: '/', 
      },
diff --git a/articles/active-directory-b2c/language-customization.md b/articles/active-directory-b2c/language-customization.md
@@ -285,7 +285,7 @@ You configure localized resources elements for the content definition and any la
       <LocalizedString ElementType="UxElement" StringId="local_intro_email">#Iniciar sesión con su cuenta existente</LocalizedString>
       <LocalizedString ElementType="UxElement" StringId="invalid_email">#Escriba una dirección de correo electrónico válida</LocalizedString>
       <LocalizedString ElementType="UxElement" StringId="unknown_error">#Tenemos problemas para iniciar su sesión. Vuelva a intentarlo más tarde.  </LocalizedString>
-      <LocalizedString ElementType="UxElement" StringId="email_pattern">^[a-zA-Z0-9.!#$%&amp;'^_`{}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$</LocalizedString>
+      <LocalizedString ElementType="UxElement" StringId="email_pattern">^[a-zA-Z0-9.!#$%&amp;'^_`\{\}~\-]+@[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*$</LocalizedString>
       <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidPassword">#Su contraseña es incorrecta.</LocalizedString>
       <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfClaimsPrincipalDoesNotExist">#Parece que no podemos encontrar su cuenta.</LocalizedString>
       <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfOldPasswordUsed">#Parece que ha usado una contraseña antigua.</LocalizedString>
diff --git a/articles/active-directory-b2c/localization-string-ids.md b/articles/active-directory-b2c/localization-string-ids.md
@@ -36,7 +36,7 @@ The following IDs are used for a content definition with an ID of `api.signupors
 | `logonIdentifier_email` | Email Address | `< 2.0.0` |
 | `requiredField_email` | Please enter your email | `< 2.0.0` |
 | `invalid_email` | Please enter a valid email address | `< 2.0.0` |
-| `email_pattern` | ```^[a-zA-Z0-9.!#$%&''\*+/=?^\_\`{\|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)\*$``` | `< 2.0.0` |
+| `email_pattern` | ```^[a-zA-Z0-9.!#$%&'*+\/=?^_`\{\|\}~\-]+@[a-zA-Z0-9\-]+(?:\\.[a-zA-Z0-9\-]+)\*$``` | `< 2.0.0` |
 | `local_intro_username` | Sign in with your user name | `< 2.0.0` |
 | `logonIdentifier_username` | Username | `< 2.0.0` |
 | `requiredField_username` | Please enter your user name | `< 2.0.0` |
@@ -178,6 +178,7 @@ The following IDs are used for a content definition having an ID of `api.localac
 | `alert_message` | Are you sure that you want to cancel entering your details? |
 | `ver_intro_msg` | Verification is necessary. Please click Send button. |
 | `ver_input` | Verification code |
+| `required_field_descriptive` | {0} is required |
 
 ### Sign-up and self-asserted pages disclaimer links
 
@@ -240,6 +241,7 @@ The following example shows the use of some of the user interface elements in th
     <LocalizedString ElementType="UxElement" StringId="initial_intro">Please provide the following details.</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="preloader_alt">Please wait</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="required_field">This information is required.</LocalizedString>
+    <LocalizedString ElementType="UxElement" StringId="required_field_descriptive">{0} is required</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="ver_but_edit">Change e-mail</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="ver_but_resend">Send new code</LocalizedString>
     <LocalizedString ElementType="UxElement" StringId="ver_but_send">Send verification code</LocalizedString>
diff --git a/articles/active-directory-b2c/troubleshoot-with-application-insights.md b/articles/active-directory-b2c/troubleshoot-with-application-insights.md
@@ -72,7 +72,7 @@ To create an instance of Application Insights in your subscription, follow these
    UserJourneyRecorderEndpoint="urn:journeyrecorder:applicationinsights"
    ```
 
-1. If it doesn't already exist, add a `<UserJourneyBehaviors>` child node to the `<RelyingParty>` node. It must be located after `<DefaultUserJourney ReferenceId="UserJourney Id" from your extensions policy, or equivalent (for example:SignUpOrSigninWithAAD" />`.
+1. If it doesn't already exist, add a `<UserJourneyBehaviors>` child node to the `<RelyingParty>` node. It must be located after `<DefaultUserJourney ReferenceId="UserJourney Id" from your extensions policy, or equivalent (for example:SignUpOrSigninWithAAD" />`. See [RelyingParty schema reference](./relyingparty.md) for a complete order of the **RelyingParty** child elements.
 1. Add the following node as a child of the `<UserJourneyBehaviors>` element. Make sure to replace `{Your Application Insights Key}` with the Application Insights **Instrumentation Key** that you recorded earlier.
 
     ```xml
@@ -96,6 +96,10 @@ To create an instance of Application Insights in your subscription, follow these
     ...
     <RelyingParty>
       <DefaultUserJourney ReferenceId="UserJourney ID from your extensions policy, or equivalent (for example: SignUpOrSigninWithAzureAD)" />
+      <Endpoints>
+         <!--points to refresh token journey when app makes refresh token request-->
+         <Endpoint Id="Token" UserJourneyReferenceId="RedeemRefreshToken" />
+      </Endpoints>
       <UserJourneyBehaviors>
         <JourneyInsights TelemetryEngine="ApplicationInsights" InstrumentationKey="{Your Application Insights Key}" DeveloperMode="true" ClientEnabled="false" ServerEnabled="true" TelemetryVersion="1.0.0" />
       </UserJourneyBehaviors>
diff --git a/articles/active-directory/hybrid/connect/media/how-to-connect-sync-staging-server/active-server-sync-server-mgmr.png b/articles/active-directory/hybrid/connect/media/how-to-connect-sync-staging-server/active-server-sync-server-mgmr.png
diff --git a/articles/azure-maps/drawing-tools-events.md b/articles/azure-maps/drawing-tools-events.md
@@ -1,9 +1,9 @@
 ---
 title: Drawing tool events | Microsoft Azure Maps
 description: This article demonstrates how to add a drawing toolbar to a map using Microsoft Azure Maps Web SDK
-author: brendansco
-ms.author: Brendanc
-ms.date: 12/05/2019
+author: dubiety
+ms.author: yuchungchen
+ms.date: 05/23/2023
 ms.topic: conceptual
 ms.service: azure-maps
 services: azure-maps
@@ -22,16 +22,21 @@ When using drawing tools on a map, it's useful to react to certain events as the
 | `drawingmodechanged` | Fired when the drawing mode has changed. The new drawing mode is passed into the event handler. |
 | `drawingstarted` | Fired when the user starts drawing a shape or puts a shape into edit mode.  |
 
-The following code shows how the events in the Drawing Tools module work. Draw shapes on the map and watch as the events fire.
+For a complete working sample of how to display data from a vector tile source on the map, see [Drawing tool events] in the [Azure Maps Samples]. In this sample you can draw shapes on the map and watch as the events fire.
 
+The following image shows a screenshot of the complete working sample that demonstrates how the events in the Drawing Tools module work.
+
+:::image type="content" source="./media/drawing-tools-events/drawing-tools-events.png" alt-text="Screenshot showing a map displaying data from a vector tile source.":::
+
+<!------------------------------------------------------------------
 <br/>
 
 <iframe height="500" scrolling="no" title="Drawing tools events" src="https://codepen.io/azuremaps/embed/dyPMRWo?height=500&theme-id=default&default-tab=js,result&editable=true" frameborder='no' loading="lazy" allowtransparency="true" allowfullscreen="true">
   See the Pen <a href='https://codepen.io/azuremaps/pen/dyPMRWo'>Drawing tools events</a> by Azure Maps
   (<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
 </iframe>
 
-<br/>
+-------------------------------------------------------------------->
 
 ## Examples
 
@@ -41,40 +46,50 @@ Let's see some common scenarios that use the drawing tools events.
 
 This code demonstrates how to monitor an event of a user drawing shapes. For this example, the code monitors shapes of polygons, rectangles, and circles. Then, it determines which data points on the map are within the drawn area. The `drawingcomplete` event is used to trigger the select logic. In the select logic, the code loops through all the data points on the map. It checks if there's an intersection of the point and the area of the drawn shape. This example makes use of the open-source [Turf.js](https://turfjs.org/) library to perform a spatial intersection calculation.
 
+For a complete working sample of how to use the drawing tools to draw polygon areas on the map with points within them that can be selected, see [Select data in drawn polygon area] in the [Azure Maps Samples].
+
+:::image type="content" source="./media/drawing-tools-events/select-data-in-drawn-polygon-area.png" alt-text="Screenshot showing a map displaying points within polygon areas.":::
+
+<!-------------------------------------------------------------------
 <br/>
 
 <iframe height="500" scrolling="no" title="Select data in drawn polygon area" src="https://codepen.io/azuremaps/embed/XWJdeja?height=500&theme-id=default&default-tab=result" frameborder='no' loading="lazy" allowtransparency="true" allowfullscreen="true">
   See the Pen <a href='https://codepen.io/azuremaps/pen/XWJdeja'>Select data in drawn polygon area</a> by Azure Maps
   (<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
 </iframe>
-
-<br/>
+---------------------------------------------------------------->
 
 ### Draw and search in polygon area
 
 This code searches for points of interests inside the area of a shape after the user finished drawing the shape. You can modify and execute the code by clicking 'Edit on Code pen' on the top-right corner of the frame. The `drawingcomplete` event is used to trigger the search logic. If the user draws a rectangle or polygon, a search inside geometry is performed. If a circle is drawn, the radius and center position is used to perform a point of interest search. The `drawingmodechanged` event is used to determine when the user switches to the drawing mode, and this event clears the drawing canvas.
 
+For a complete working sample of how to use the drawing tools to search for points of interests within drawn areas, see [Draw and search polygon area] in the [Azure Maps Samples].
+
+:::image type="content" source="./media/drawing-tools-events/draw-and-search-polygon-area.png" alt-text="Screenshot showing a map displaying the Draw and search in polygon area sample.":::
+
+<!-------------------------------------------------------------------
 <br/>
 
 <iframe height="500" scrolling="no" title="Draw and search in polygon area" src="https://codepen.io/azuremaps/embed/eYmZGNv?height=500&theme-id=default&default-tab=js,result&editable=true" frameborder='no' loading="lazy" allowtransparency="true" allowfullscreen="true">
   See the Pen <a href='https://codepen.io/azuremaps/pen/eYmZGNv'>Draw and search in polygon area</a> by Azure Maps
   (<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
 </iframe>
-
-<br/>
+---------------------------------------------------------------->
 
 ### Create a measuring tool
 
 The following code shows how the drawing events can be used to create a measuring tool. The `drawingchanging` is used to monitor the shape, as it's being drawn. As the user moves the mouse, the dimensions of the shape are calculated. The `drawingcomplete` event is used to do a final calculation on the shape after it has been drawn. The `drawingmodechanged` event is used to determine when the user is switching into a drawing mode. Also, the  `drawingmodechanged` event clears the drawing canvas and clears old measurement information.
 
-<br/>
+For a complete working sample of how to use the drawing tools to measure distances and areas, see [Create a measuring tool] in the [Azure Maps Samples].
 
+:::image type="content" source="./media/drawing-tools-events/create-a-measuring-tool.png" alt-text="Screenshot showing a map displaying the measuring tool sample.":::
+
+<!-------------------------------------------------------------------
 <iframe height="500" scrolling="no" title="Measuring tool" src="https://codepen.io/azuremaps/embed/RwNaZXe?height=500&theme-id=default&default-tab=js,result&editable=true" frameborder='no' loading="lazy" allowtransparency="true" allowfullscreen="true">
   See the Pen <a href='https://codepen.io/azuremaps/pen/RwNaZXe'>Measuring tool</a> by Azure Maps
   (<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
 </iframe>
-
-<br/>
+---------------------------------------------------------------->
 
 ## Next steps
 
@@ -95,3 +110,9 @@ Check out more code samples:
 
 > [!div class="nextstepaction"]
 > [Code sample page](https://aka.ms/AzureMapsSamples)
+
+[Azure Maps Samples]:https://samples.azuremaps.com
+[Drawing tool events]: https://samples.azuremaps.com/?search=Drawing%20tool&sample=drawing-tools-events
+[Select data in drawn polygon area]:https://samples.azuremaps.com/?search=Drawing%20tool&sample=select-data-in-drawn-polygon-area
+[Draw and search polygon area]: https://samples.azuremaps.com/?search=Drawing%20tool&sample=draw-and-search-polygon-area
+[Create a measuring tool]: https://samples.azuremaps.com/?search=Drawing%20tool&sample=create-a-measuring-tool
diff --git a/articles/azure-maps/media/drawing-tools-events/create-a-measuring-tool.png b/articles/azure-maps/media/drawing-tools-events/create-a-measuring-tool.png
diff --git a/articles/azure-maps/media/drawing-tools-events/draw-and-search-polygon-area.png b/articles/azure-maps/media/drawing-tools-events/draw-and-search-polygon-area.png
diff --git a/articles/azure-maps/media/drawing-tools-events/drawing-tools-events.png b/articles/azure-maps/media/drawing-tools-events/drawing-tools-events.png
diff --git a/articles/azure-maps/media/drawing-tools-events/select-data-in-drawn-polygon-area.png b/articles/azure-maps/media/drawing-tools-events/select-data-in-drawn-polygon-area.png
diff --git a/articles/azure-signalr/concept-upstream.md b/articles/azure-signalr/concept-upstream.md
@@ -60,7 +60,7 @@ To enable managed identity in your SignalR service instance and grant it Key Vau
 3. Replace your sensitive text with the below syntax in the upstream endpoint URL Pattern:
    ```
    {@Microsoft.KeyVault(SecretUri=<secret-identity>)}
-   ``
+   ```
    `<secret-identity>` is the full data-plane URI of a secret in Key Vault, optionally including a version, e.g., https://myvault.vault.azure.net/secrets/mysecret/ or https://myvault.vault.azure.net/secrets/mysecret/ec96f02080254f109c51a1f14cdb1931
    
    For example, a complete reference would look like the following:
diff --git a/articles/mariadb/concepts-connectivity-architecture.md b/articles/mariadb/concepts-connectivity-architecture.md
@@ -53,7 +53,7 @@ The following table lists the gateway IP addresses of the Azure Database for Mar
 | East US |40.71.8.203, 40.71.83.113 |40.121.158.30|191.238.6.43 |
 | East US 2 | 40.70.144.38, 52.167.105.38  | 52.177.185.181 | |
 | France Central | 40.79.137.0, 40.79.129.1     | | |
-| France South | 40.79.177.0     | | |
+| France South | 40.79.177.0, 40.79.176.40     | | |
 | Germany Central | 51.4.144.100     | | |
 | Germany North | 51.116.56.0 | |
 | Germany North East | 51.5.144.179     | | |
diff --git a/articles/spring-apps/how-to-outbound-public-ip.md b/articles/spring-apps/how-to-outbound-public-ip.md
@@ -27,6 +27,9 @@ An Azure Spring Apps service has one or more outbound public IP addresses. The n
 
 The outbound public IP addresses are usually constant and remain the same, but there are exceptions.
 
+> [!IMPORTANT]
+> If the Azure Spring Apps instance is deployed in your own virtual network, the static outbound IP might be changed after the Start/Stop Azure Spring Apps service instance operation.
+
 ## When outbound IPs change
 
 Each Azure Spring Apps instance has a set number of outbound public IP addresses at any given time. Any outbound connection from the applications, such as to a back-end database, uses one of the outbound public IP addresses as the origin IP address. The IP address is selected randomly at runtime, so your back-end service must open its firewall to all the outbound IP addresses.
diff --git a/articles/storage/blobs/blob-inventory.md b/articles/storage/blobs/blob-inventory.md
@@ -315,7 +315,7 @@ Each inventory run for a rule generates the following files:
 - **Inventory file:** An inventory run for a rule generates one or more CSV or Apache Parquet formatted files. If the matched object count is large, then multiple files are generated instead of a single file. Each such file contains matched objects and their metadata. 
 
   > [!NOTE]
-  > Reports in the Apache Parquet format present dates in the following format: `timestamp_millis [number of milliseconds since 1970-01-01 00:00:00 UTC`.
+  > Reports in the Apache Parquet format present dates in the following format: `timestamp_millis [number of milliseconds since 1970-01-01 00:00:00 UTC`].
 
   For a CSV formatted file, the first row is always the schema row. The following image shows an inventory CSV file opened in Microsoft Excel.
 
