Merge pull request #290893 from MicrosoftDocs/main

11/21/2024 AM Publish

Author: Taojunshen

articles/app-service/environment/networking.md

@@ -16,7 +16,11 @@ App Service Environment is a single-tenant deployment of Azure App Service that
 
 ## Subnet requirements
 
-You must delegate the subnet to `Microsoft.Web/hostingEnvironments`, and the subnet must be empty.
+The following are the minimum set of requirements for the subnet your App Service Environment is in.
+
+- The subnet must be delegated to `Microsoft.Web/hostingEnvironments`.
+- The subnet must be empty.
+- The subnet's `addressPrefix` property must be formatted as a string, not an array. 
 
 The size of the subnet can affect the scaling limits of the App Service plan instances within the App Service Environment. For production scale, we recommend a `/24` address space (256 addresses) for your subnet. If you plan to scale near max capacity of 200 instances in our App Service Environment and you plan frequent up/down scale operations, we recommend a `/23` address space (512 addresses) for your subnet.
 

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

@@ -68,7 +68,7 @@ function InitMap()
   map.events.add('ready', function () {
 
     //Load the custom image icon into the map resources.
-    map.imageSprite.add('arrow-icon', 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1717245/purpleArrowRight.png').then(function () {
+    map.imageSprite.add('arrow-icon', '/images/icons/purpleArrowRight.png').then(function () {
       //Create a data source and add it to the map.
       datasource = new atlas.source.DataSource();
       map.sources.add(datasource);
@@ -125,6 +125,9 @@ This code creates a map that appears as follows:
 
 :::image type="content" source="./media/map-add-line-layer/add-symbols-along-a-line.png" lightbox="./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.":::
 
+> [!NOTE]
+> For a copy of the image file used in the above sample, see [purpleArrowRight.png](https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Static/images/icons/purpleArrowRight.png) in GitHub.
+
 <!-----------------------------------------------------------------------
 > [!VIDEO //codepen.io/azuremaps/embed/drBJwX/?height=500&theme-id=0&default-tab=js,result&editable=true]
 ----------------------------------------------------------------------->

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

@@ -125,7 +125,7 @@ function InitMap()
     map.events.add('ready', function () {
 
       //Load the custom image icon into the map resources.
-      map.imageSprite.add('my-custom-icon', 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1717245/showers.png').then(function () {
+      map.imageSprite.add('my-custom-icon', '/images/icons/showers.png').then(function () {
 
         //Create a data source and add it to the map.
         var datasource = new atlas.source.DataSource();
@@ -160,6 +160,9 @@ function InitMap()
 
 :::image type="content" source="./media/map-add-pin/add-custom-icon-to-symbol-layer.png" alt-text="A screenshot of map with a pin added using the symbol layer with a custom icon.":::
 
+> [!NOTE]
+> For a copy of the image file used in the above sample, see [showers.png](https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Static/images/icons/showers.png) in GitHub.
+
 <!-------------------------------------------
 > [!VIDEO //codepen.io/azuremaps/embed/WYWRWZ/?height=500&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
 ------------------------------------->

articles/azure-maps/media/about-azure-maps/intro_web_map_control.png

@@ -63,7 +63,18 @@ function InitMap()
     map.layers.add(layer);
 
     //Load an initial data set.
-    loadDataSet('https://s3-us-west-2.amazonaws.com/s.cdpn.io/1717245/use-simple-data-layer.json');
+    const dataSet = {
+        "type": "Feature",
+        "geometry": {
+            "type": "Point",
+            "coordinates": [0, 0]
+        },
+        "properties": {
+            "color": "red"
+        }
+    };
+    
+    loadDataSet(dataSet);
 
     function loadDataSet(url) {
       //Read the spatial data and add it to the map.
@@ -86,21 +97,6 @@ function InitMap()
 }
 ```
 
-The url passed to the `loadDataSet` function points to the following json:
-
-```json
-{
-    "type": "Feature",
-    "geometry": {
-        "type": "Point",
-        "coordinates": [0, 0]
-    },
-    "properties": {
-        "color": "red"
-    }
-}
-```
-
 Once you add features to the data source, the simple data layer figures out how best to render them. Styles for individual features can be set as properties on the feature.
 
 The above sample code shows a GeoJSON point feature with a `color` property set to `red`.

articles/azure-maps/media/spatial-io-read-write-spatial-data/read-delimited-file.png

@@ -84,58 +84,57 @@ atlas.io.read('https://nonCorsDomain.example.com/mySuperCoolData.xml', {
 The following code snippet shows how to read a delimited file and render it on the map. In this case, the code uses a CSV file that has spatial data columns. You must add a reference to the Azure Maps Spatial IO module.
 
 ```javascript
-
 <!-- Add reference to the Azure Maps Spatial IO module. -->
 <script src="https://atlas.microsoft.com/sdk/javascript/spatial/0/atlas-spatial.min.js"></script>
 
-<script type="text/javascript">
-var map, datasource, layer;
-
-//a URL pointing to the CSV file
-var delimitedFileUrl = "https://s3-us-west-2.amazonaws.com/s.cdpn.io/1717245/earthquakes_gt7_alltime.csv";
-
-function InitMap()
-{
-  map = new atlas.Map('myMap', {
-    center: [-73.985708, 40.75773],
-    zoom: 12,
-    view: "Auto",
-
-    //Add authentication details for connecting to Azure Maps.
-    authOptions: {
-      // Get an Azure Maps key at https://azuremaps.com/.
-      authType: 'subscriptionKey',
-      subscriptionKey: '{Your-Azure-Maps-Subscription-key}'
-    },
-  });    
-
-  //Wait until the map resources are ready.
-  map.events.add('ready', function () {
-    //Create a data source and add it to the map.
-    datasource = new atlas.source.DataSource();
-    map.sources.add(datasource);
-
-    //Add a simple data layer for rendering the data.
-    layer = new atlas.layer.SimpleDataLayer(datasource);
-    map.layers.add(layer);
-
-    //Read a CSV file from a URL or pass in a raw string.
-    atlas.io.read(delimitedFileUrl).then(r => {
-      if (r) {
-      //Add the feature data to the data source.
-      datasource.add(r);
-
-      //If bounding box information is known for data, set the map view to it.
-      if (r.bbox) {
-        map.setCamera({
-        bounds: r.bbox,
-        padding: 50
+<script>
+    var datasource, delimitedFileUrl = "Chicago_Police_Stations.csv";
+    // Download CSV file (delimitedFileUrl) from:
+    // https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Static/data/SpatialCSV/Chicago_Police_Stations.csv
+
+    function GetMap() {
+
+        //Instantiate a map object
+        var map = new atlas.Map("myMap", {
+            center: [-87.628899, 41.874693],
+            zoom: 9,
+            view: "Auto",
+            // Replace <Your Azure Maps Subscription Key> with your Azure Maps subscription key. https://aka.ms/am-primaryKey
+            authOptions: {
+                authType: 'subscriptionKey',
+                subscriptionKey: '{Your-Azure-Maps-Subscription-key}'
+            }
+        });
+    
+    //Wait until the map resources are ready.
+      map.events.add('ready', function () {
+        
+        //Create a data source and add it to the map.
+        datasource = new atlas.source.DataSource();
+        map.sources.add(datasource);
+        
+        //Add a simple data layer for rendering the data.
+        layer = new atlas.layer.SimpleDataLayer(datasource);
+        map.layers.add(layer);
+        
+        //Read a CSV file from a URL or pass in a raw string.
+        atlas.io.read(delimitedFileUrl).then(r => {
+            if (r) {
+                
+                //Add the feature data to the data source.
+                datasource.add(r);
+                
+                //If bounding box information is known for data, set the map view to it.
+                if (r.bbox) {
+                    map.setCamera({
+                        bounds: r.bbox,
+                        padding: 50
+                    });
+                }
+            }
+          });
         });
       }
-      }
-    });
-  });
-}
 </script>
 ```
 

articles/azure-maps/spatial-io-add-simple-data-layer.md

@@ -2,7 +2,7 @@
 title: Overview - retention of Azure Database for MySQL - Flexible Server for long term by using Azure Backup
 description: This article provides an overview of Azure Database for MySQL - Flexible Server retention for long term.
 ms.topic: overview
-ms.date: 03/08/2024
+ms.date: 11/21/2024
 ms.service: azure-backup
 ms.custom: engagement-fy23
 author: AbhishekMallick-MS
@@ -11,6 +11,8 @@ ms.author: v-abhmallick
 
 # Long-term retention for Azure Database for MySQL - Flexible Server by using Azure Backup (preview)
 
+[!INCLUDE [Azure Database for MySQL - Flexible Server backup advisory](../../includes/backup-mysql-flexible-server-advisory.md)]
+
 Azure Backup and Azure Database Services together allow you to build an enterprise-class backup solution for Azure Database for MySQL - Flexible servers that retain backups for **up to 10 years**. If you have an Azure Database for MySQL - Flexible server, then you can extend  the retention of backups beyond 35 days with built-in operational tier backup capability of MySQL - Flexible database.
 
 This feature allows you to extend the current limitation of *35 days* backup retention to *10 years*, meeting your compliance and regulatory requirements.

articles/azure-maps/spatial-io-read-write-spatial-data.md

@@ -2,13 +2,15 @@
 title: Restore the Azure Database for MySQL - Flexible Server by using Azure Backup
 description: Learn how to restore the Azure Database for MySQL - Flexible Server.
 ms.topic: how-to
-ms.date: 03/08/2024
+ms.date: 11/21/2024
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---
 
 # Restore the Azure Database for MySQL - Flexible Server by using Azure Backup (preview)
 
+[!INCLUDE [Azure Database for MySQL - Flexible Server backup advisory](../../includes/backup-mysql-flexible-server-advisory.md)]
+
 This article describes how to restore the Azure Database for MySQL - Flexible Server by using Azure Backup.
 
 Learn more about the [supported scenarios. considerations, and limitations](backup-azure-mysql-flexible-server-support-matrix.md).

articles/backup/backup-azure-mysql-flexible-server-about.md

@@ -2,7 +2,7 @@
 title: Support matrix for Azure Database for MySQL - Flexible Server retention for long term by using Azure Backup
 description: Provides a summary of support settings and limitations when backing up Azure Database for MySQL - Flexible Server.
 ms.topic: reference
-ms.date: 09/11/2024
+ms.date: 11/21/2024
 ms.custom: references_regions
 ms.service: azure-backup
 author: AbhishekMallick-MS
@@ -11,6 +11,8 @@ ms.author: v-abhmallick
 
 # Support matrix for Azure Database for MySQL - Flexible Server protection by using Azure Backup (preview)
 
+[!INCLUDE [Azure Database for MySQL - Flexible Server backup advisory](../../includes/backup-mysql-flexible-server-advisory.md)]
+
 This article summarizes  the supported scenarios, considerations, and limitations for Azure Database for MySQL - Flexible Server backup and retention for long term by using [Azure Backup](./backup-overview.md).
 
 ## Supported regions