Skip to content

Commit cf67281

Browse files
committed
Merge branch 'main' into release-pp-nsp
2 parents 5200291 + 3eb236a commit cf67281

File tree

65 files changed

+354
-201
lines changed

Some content is hidden

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

65 files changed

+354
-201
lines changed

articles/api-center/configure-environments-deployments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ Here you add a deployment by associating one of your APIs with the environment y
7373

7474
1. In the left menu, under **Assets**, select **APIs**.
7575

76-
1. Select an API, for example, the *Demo Conference API*.
76+
1. Select an API, for example, the *Conference API*.
7777

78-
1. On the **Demo Conference API** page, under **Details**, select **Deployments** > **+ Add deployment**.
78+
1. On the **Conference API** page, under **Details**, select **Deployments** > **+ Add deployment**.
7979

8080
1. In the **Add deployment** page, add the following information. If you previously defined the custom *Line of business* metadata or other metadata assigned to environments, you'll see them at the bottom of the page.
8181

@@ -85,7 +85,7 @@ Here you add a deployment by associating one of your APIs with the environment y
8585
|**Identification**|After you enter the preceding title, Azure API Center generates this identifier, which you can override.| Azure resource name for the deployment.|
8686
| **Description** | Optionally enter a description. | Description of the deployment. |
8787
| **Environment** | Make a selection from the dropdown, such as *My Testing*, or optionally select **Create new**.| New or existing environment where the API version is deployed. |
88-
| **Definition** | Select or add a definition file for a version of the Demo Conference API. | API definition file. |
88+
| **Definition** | Select or add a definition file for a version of the Conference API. | API definition file. |
8989
| **Runtime URL** | Enter a base URL, for example, `https://api.contoso.com`. | Base runtime URL for the API in the environment. |
9090
| **Line of business** | If you added this custom metadata, optionally make a selection from the dropdown, such as **IT**. | Custom metadata that identifies the business unit that manages APIs in the environment. |
9191

447 Bytes
Loading
35.3 KB
Loading
2.17 KB
Loading
1.58 KB
Loading

articles/api-center/register-apis.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this tutorial, you learn how to use the portal to:
2727
* One or more APIs that you want to register in your API center. Here are two examples, with links to their OpenAPI definitions:
2828

2929
* [Swagger Petstore API](https://github.com/swagger-api/swagger-petstore/blob/master/src/main/resources/openapi.yaml)
30-
* [Azure Demo Conference API](https://conferenceapi.azurewebsites.net?format=json)
30+
* [Conference API](https://bigconference.azurewebsites.net)
3131

3232
* Complete the previous tutorial, [Define custom metadata](add-metadata-properties.md), to define custom metadata for your APIs.
3333

@@ -41,7 +41,7 @@ When you register (add) an API in your API center, the API registration includes
4141

4242
After registering an API, you can add versions and definitions to the API.
4343

44-
The following steps register two sample APIs: Swagger Petstore API and Demo Conference API (see [Prerequisites](#prerequisites)). If you prefer, register APIs of your own.
44+
The following steps register two sample APIs: Swagger Petstore API and Conference API (see [Prerequisites](#prerequisites)). If you prefer, register APIs of your own.
4545

4646
1. In the [portal](https://portal.azure.com), navigate to your API center.
4747

@@ -70,7 +70,7 @@ The following steps register two sample APIs: Swagger Petstore API and Demo Conf
7070

7171
1. Select **Create**. The API is registered.
7272

73-
1. Repeat the preceding three steps to register another API, such as the Demo Conference API.
73+
1. Repeat the preceding three steps to register another API, such as the Conference API.
7474

7575
> [!TIP]
7676
> When you register an API in the portal, you can select any of the predefined API types or enter another type of your choice.
@@ -89,9 +89,9 @@ Here you add a version to one of your APIs:
8989

9090
1. In the portal, navigate to your API center.
9191

92-
1. In the left menu, select **APIs**, and then select an API, for example, *Demo Conference API*.
92+
1. In the left menu, select **APIs**, and then select an API, for example, *Swagger Petstore*.
9393

94-
1. On the Demo Conference API page, under **Details**, select **Versions** > **+ Add version**.
94+
1. On the API page, under **Details**, select **Versions** > **+ Add version**.
9595

9696
:::image type="content" source="media/register-apis/add-version.png" alt-text="Screenshot of adding an API version in the portal." lightbox="media/register-apis/add-version.png":::
9797

@@ -126,9 +126,9 @@ To add an API definition to your version:
126126
|**Title**| Enter a title of your choice, such as *v2 Definition*.|Name you choose for the API definition.|
127127
|**Identification**|After you enter the preceding title, Azure API Center generates this identifier, which you can override.| Azure resource name for the definition.|
128128
| **Description** | Optionally enter a description. | Description of the API definition. |
129-
| **Specification name** | For the Demo Conference API, select **OpenAPI**. | Specification format for the API.|
130-
| **Specification version** | Enter a version identifier of your choice, such as *2.0*. | Specification version. |
131-
|**Document** | Browse to a local definition file for the Demo Conference API, or enter a URL. Example URL: `https://conferenceapi.azurewebsites.net?format=json` | API definition file. |
129+
| **Specification name** | For the Petstore API, select **OpenAPI**. | Specification format for the API.|
130+
| **Specification version** | Enter a version identifier of your choice, such as *3.0*. | Specification version. |
131+
|**Document** | Browse to a local definition file for the Petstore API, or enter a URL. Example URL: `https://raw.githubusercontent.com/swagger-api/swagger-petstore/refs/heads/master/src/main/resources/openapi.yaml` | API definition file. |
132132

133133
:::image type="content" source="media/register-apis/add-definition.png" alt-text="Screenshot of adding an API definition in the portal." lightbox="media/register-apis/add-definition.png" :::
134134

articles/app-service/routine-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Maintenance operations upgrade machines iteratively while App Service monitors t
6060

6161
### Are business hours reflected?
6262

63-
Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). For App Service plans and App Service Environment v2, maintenance can continue into business hours during longer maintenance events.
63+
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). If resources are still upgrading by 9 AM in a given region, the upgrade will safely pause before the next critical step and until the end of business hours.
6464

6565
### What are my options to control routine maintenance?
6666

articles/azure-functions/start-stop-vms/troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.topic: conceptual
99

1010
# Troubleshoot common issues with Start/Stop VMs
1111

12-
This article provides information on troubleshooting and resolving issues that may occur while attempting to install and configure Start/Stop VMs. For general information, see [Start/Stop VMs overview](overview.md).
12+
This article provides information on troubleshooting and resolving issues that may occur while attempting to install and configure Start/Stop VMs.
1313

1414
## General validation and troubleshooting
1515

articles/azure-maps/add-custom-protocol-pmtiles.md

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,28 @@ By using the `addProtocol` function, which registers a callback triggered before
2020
The first step is to add a reference to the protocol. The following example references the `pmtiles` library:
2121

2222
```html
23-
<script src="https://unpkg.com/pmtiles@3.0.5/dist/pmtiles.js"></script>
23+
<script src="https://unpkg.com/pmtiles@3.2.0/dist/pmtiles.js"></script>
2424
```
2525

2626
Next, initialize the MapLibre PMTiles protocol.
2727

2828
```js
29-
//Initialize the plugin.
30-
const protocol = new pmtiles.Protocol();
31-
atlas.addProtocol("pmtiles", (request) => {
32-
return new Promise((resolve, reject) => {
33-
const callback = (err, data) => {
34-
if (err) {
35-
reject(err);
36-
} else {
37-
resolve({ data });
38-
}
39-
};
40-
protocol.tile(request, callback);
41-
});
42-
});
43-
```
44-
45-
## Add PMTiles protocol
46-
47-
To add the PMTiles protocol, hook the data source with the specified protocol URI scheme. The following sample uses the [Overture] building dataset to add building data over the basemap.
48-
49-
```js
50-
const PMTILES_URL = "https://overturemaps-tiles-us-west-2-beta.s3.amazonaws.com/2024-07-22/buildings.pmtiles";
51-
protocol.add(new pmtiles.PMTiles(PMTILES_URL));
29+
//Initialize the plugin.
30+
const protocol = new pmtiles.Protocol();
31+
atlas.addProtocol("pmtiles", protocol.tile);
5232
```
5333

5434
## Add PMTiles as a map source
5535

36+
The following sample uses the [Overture] building dataset to add building data over the basemap.
37+
5638
PMTiles are added as a map source during the map event. Once added, the specified URI scheme is available to the Azure Maps Web SDK. In the following sample, the PMTiles URL is added as a `VectorTileSource`.
5739

5840
```js
41+
const PMTILES_URL = "https://overturemaps-tiles-us-west-2-beta.s3.amazonaws.com/2024-07-22/buildings.pmtiles";
5942
//Add the source to the map.
6043
map.sources.add(
61-
new atlas.source.VectorTileSource("pmtiles", {
44+
new atlas.source.VectorTileSource("my_source", {
6245
type: "vector",
6346
url: `pmtiles://${PMTILES_URL}`,
6447
})
@@ -77,7 +60,7 @@ The following sample uses the building theme's properties (for example, building
7760
```js
7861
//Create a polygon extrusion layer.
7962
layer = new atlas.layer.PolygonExtrusionLayer(
80-
"pmtiles",
63+
"my_source",
8164
"building",
8265
{
8366
sourceLayer: "building",

articles/azure-resource-manager/management/move-resource-group-and-subscription.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,10 @@ When you receive this error, you have two options. Either move your resources to
479479

480480
No, you can't move a resource group to a new subscription. But, you can move all of the resources in the resource group to a resource group in another subscription. Settings such as tags, role assignments, and policies aren't automatically transferred from the original resource group to the destination resource group. You need to reapply these settings to the new resource group. For more information, see [Move resources to new resource group or subscription](./move-support-resources.md).
481481

482+
### Unsupported scenarios
483+
484+
The platform blocks a scenario where resources from Subscription A are migrated to Subscription B when *at the same time* resources from Subscription B are migrated to Subscription C. This is by design.
485+
482486
## Next steps
483487

484488
For a list of which resources support move, see [Move operation support for resources](move-support-resources.md).

0 commit comments

Comments
 (0)