Skip to content

Commit db2a8e9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into erlanding
2 parents 9f5fb15 + 19c5cdd commit db2a8e9

File tree

237 files changed

+817
-987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+817
-987
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/create",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/migrate/context/vmware-context.yml",
10+
"redirect_url": "articles/migrate/context/migrate-context",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/partner-solutions/split-experimentation/how-to-set-up-data-access.md",
1015
"redirect_url": "/previous-versions/azure/partner-solutions/split-experimentation/how-to-set-up-data-access",
@@ -4044,11 +4049,16 @@
40444049
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
40454050
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
40464051
"redirect_document_id": false
4047-
},
4052+
},
40484053
{
40494054
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-powershell.md",
40504055
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
40514056
"redirect_document_id": false
4057+
},
4058+
{
4059+
"source_path_from_root": "/articles/fasttrack/index.yml",
4060+
"redirect_url": "/azure",
4061+
"redirect_document_id": false
40524062
}
40534063
]
40544064
}

articles/api-management/inject-vnet-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ When you [create](get-started-create-service-instance.md) a Premium v2 instance
8888

8989
1. In the **Create API Management service** wizard, select the **Networking** tab.
9090
1. In **Connectivity type**, select **Virtual network**.
91-
1. In **Type**, select **Internal**.
91+
1. In **Type**, select **Virtual Network injection**.
9292
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to inject.
9393
1. Complete the wizard to create the API Management instance.
9494

articles/azure-cache-for-redis/cache-tutorial-functions-getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ dotnet add package Microsoft.Azure.Functions.Worker.Extensions.Redis --prereleas
298298

299299
1. Confirm that the triggers are being activated in the terminal.
300300

301-
:::image type="content" source="media/cache-tutorial-functions-getting-started/cache-triggers-working-lightbox.png" alt-text="Screenshot of the VS Code editor with code running." lightbox="media/cache-tutorial-functions-getting-started/cache-triggers-working.png":::
301+
:::image type="content" source="media/cache-tutorial-functions-getting-started/cache-triggers-working-lightbox.png" alt-text="Screenshot of the VS Code editor with code running." :::
302302

303303
## Add Redis bindings
304304

articles/azure-cache-for-redis/cache-web-app-howto.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ After the new app has been published, add a new app setting. This setting is use
215215

216216
2. Add a new app setting named **CacheConnection** for the app to use to connect to the cache. Use the same value you configured for `RedisHostName` in your *web.config* file.
217217

218-
:::image type="content" source="media/cache-web-app-howto/cache-add-app-setting.png" alt-text="Screenshot showing how to add app setting.":::
219-
220218
### Run the app in Azure
221219

222220
1. In your browser, go to the URL for the app. The URL appears in the results of the publishing operation in the Visual Studio output window. It's also provided in the Azure portal on the overview page of the app you created.
28 KB
Loading
240 KB
Loading
62.5 KB
Loading

articles/azure-maps/migrate-help-using-copilot.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ GitHub Copilot generates a code snippet that matches your instructions, using [A
112112
<meta charset="UTF-8">
113113
<meta name="viewport" content="width=device-width, initial-scale=1.0">
114114
<title>Azure Maps Geocode and Pushpin Example</title>
115-
<script type="text/javascript" src="https://atlas.microsoft.com/sdk/js/atlas.min.js?api-version=3"></script>
115+
<link href="https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.css" rel="stylesheet" />
116+
<script src="https://atlas.microsoft.com/sdk/javascript/mapcontrol/3/atlas.min.js"></script>
116117
<style>
117118
#map {
118119
width: 100%;
@@ -124,7 +125,7 @@ GitHub Copilot generates a code snippet that matches your instructions, using [A
124125
<div id="map"></div>
125126
<script>
126127
var subscriptionKey = 'YOUR_SUBSCRIPTION_KEY'; // Replace with your Azure Maps subscription key
127-
var query = '1 Microsoft Way, Seattle';
128+
var query = '1 Microsoft Way, Redmond';
128129
129130
// Make Geocode API request
130131
fetch(`https://atlas.microsoft.com/geocode?api-version=2023-06-01&subscription-key=${subscriptionKey}&query=${query}`)

0 commit comments

Comments
 (0)