Skip to content

Commit f1737e2

Browse files
authored
Merge pull request #298998 from MicrosoftDocs/main
Auto Publish – main to live - 2025-04-29 05:00 (UTC)
2 parents 4da7b9d + 75aff69 commit f1737e2

File tree

40 files changed

+1130
-892
lines changed

40 files changed

+1130
-892
lines changed

articles/api-management/api-management-howto-developer-portal-customize.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: tutorial
9-
ms.date: 03/29/2024
9+
ms.date: 04/28/2025
1010
ms.author: danlep
1111
ms.custom: engagement-fy23
1212
---
@@ -28,7 +28,7 @@ In this tutorial, you learn how to:
2828
2929
For more information about developer portal features and options, see [Azure API Management developer portal overview](developer-portal-overview.md).
3030

31-
:::image type="content" source="media/api-management-howto-developer-portal-customize/cover.png" alt-text="Screenshot of the API Management developer portal - administrator mode." border="false":::
31+
:::image type="content" source="media/api-management-howto-developer-portal-customize/cover.png" alt-text="Screenshot of the API Management developer portal - administrator mode." :::
3232

3333
## Prerequisites
3434

@@ -49,6 +49,8 @@ Follow these steps to access the managed version of the developer portal.
4949
It might take a few minutes to enable the developer portal.
5050
1. In the left menu, under **Developer portal**, select **Portal overview**. Then select the **Developer portal** button in the top navigation bar. A new browser tab with an administrative version of the portal will open.
5151

52+
[!INCLUDE [developer-portal-editor-refresh](../../includes/developer-portal-editor-refresh.md)]
53+
5254
## Understand the portal's administrative interface
5355

5456
[!INCLUDE [api-management-developer-portal-editor](../../includes/api-management-developer-portal-editor.md)]
@@ -70,7 +72,7 @@ You'll want to use your own images and other media content in the developer port
7072

7173
A placeholder logo is provided in the top left corner of the navigation bar. You can replace it with your own logo to match your organization's branding.
7274

73-
1. In the developer portal, select the default **Contoso** logo in the top left of the navigation bar.
75+
1. In the developer portal, select the default logo in the top left of the navigation bar.
7476
1. Select **Edit**.
7577
1. In the **Picture** pop-up, under **Main**, select **Source**.
7678
1. In the **Media** pop-up, select one of the following:

articles/api-management/developer-portal-overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: concept-article
10-
ms.date: 03/29/2024
10+
ms.date: 04/28/2025
1111
ms.author: danlep
1212
---
1313

@@ -76,21 +76,18 @@ The developer portal's administrative interface provides a visual editor for pub
7676

7777
[!INCLUDE [api-management-developer-portal-add](../../includes/api-management-developer-portal-add.md)]
7878

79-
[!INCLUDE [api-management-developer-portal-wordpress](../../includes/api-management-developer-portal-wordpress.md)]
79+
### Pages and layouts
8080

81+
The pre-provisioned content in the developer portal showcases pages with commonly used features. Find them on the **Pages** panel. You can modify the content of these pages or add new ones to suit your needs.
8182

82-
### Layouts and pages
83-
84-
Layouts define how pages are displayed. For example, in the default content, there are two layouts: one applies to the home page, and the other to all remaining pages. You can modify these layouts and add more layouts to suit your needs.
83+
Select **Layouts** on the **Pages** panel to define how pages are displayed. The developer portal comes with a default layout that's applied to the pages. You can modify this layout and add more layouts to suit your needs.
8584

8685
A layout gets applied to a page by matching its URL template to the page's URL. For example, a layout with a URL template of `/wiki/*` is applied to every page with the `/wiki/` segment in the URL: `/wiki/getting-started`, `/wiki/styles`, etc.
8786

8887
In the following image, content belonging to the layout is outlined in blue, while the page-specific content is outlined in red.
8988

9089
:::image type="content" source="media/developer-portal-overview/pages-layouts.png" alt-text="Screenshot of layout content in the developer portal." :::
9190

92-
The pre-provisioned content in the developer portal showcases pages with commonly used features. You can modify the content of these pages or add new ones to suit your needs.
93-
9491
> [!NOTE]
9592
> Due to integration considerations, the following pages can't be removed or moved under a different URL: `/404`, `/500`, `/captcha`, `/change-password`, `/config.json`, `/confirm/invitation`, `/confirm-v2/identities/basic/signup`, `/confirm-v2/password`, `/internal-status-0123456789abcdef`, `/publish`, `/signin`, `/signin-sso`, `/signup`.
9693
@@ -248,7 +245,8 @@ To restore a previous portal revision:
248245
If you want to discard all changes you've made to the developer portal, you can reset the website to its starting state. Resetting the portal deletes any changes you've made to the developer portal pages, layouts, customizations, and uploaded media.
249246

250247
> [!NOTE]
251-
> Resetting the developer portal doesn't delete the published version of the developer portal.
248+
> * Resetting the developer portal doesn't delete the published version of the developer portal.
249+
> * Resetting the portal could update the portal to a newer version of the developer portal codebase with updated components. The placeholder content that appears might also be changed. Developer portal features and customization options remain consistent.
252250
253251
To reset the developer portal:
254252

300 KB
Loading
5.07 KB
Loading
300 KB
Loading
60.4 KB
Loading

articles/azure-functions/functions-container-apps-hosting.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Container Apps hosting of Azure Functions
33
description: Learn about how you can use Azure Functions on Azure Container Apps to host and manage containerized function apps in Azure.
4-
ms.date: 01/05/2025
4+
ms.date: 04/22/2025
55
ms.topic: conceptual
66
ms.custom: build-2024, linux-related-content
77
# Customer intent: As a cloud developer, I want to learn more about hosting my function apps in Linux containers managed by Azure Container Apps.
@@ -83,6 +83,7 @@ When you host your function apps in a Container Apps environment, your functions
8383

8484
All Functions triggers can be used in your containerized function app. However, only these triggers can dynamically scale (from zero instances) based on received events when running in a Container Apps environment:
8585

86+
+ Azure Cosmos DB (KEDA connection)
8687
+ Azure Event Grid
8788
+ Azure Event Hubs
8889
+ Azure Blob Storage (Event Grid based)
@@ -92,7 +93,6 @@ All Functions triggers can be used in your containerized function app. However,
9293
+ HTTP
9394
+ Kafka
9495
+ Timer
95-
+ Azure Cosmos DB
9696

9797
Azure Functions on Container Apps is designed to configure the scale parameters and rules as per the event target. You don't need to worry about configuring the KEDA scaled objects. You can still set minimum and maximum replica count when creating or modifying your function app. The following Azure CLI command sets the minimum and maximum replica count when creating a new function app in a Container Apps environment from an Azure Container Registry:
9898

@@ -130,10 +130,6 @@ Keep in mind the following considerations when deploying your function app conta
130130
+ The protocol value of `ssl` isn't supported when hosted on Container Apps. Use a [different protocol value](functions-bindings-kafka-trigger.md?pivots=programming-language-csharp#attributes).
131131
+ For a Kafka trigger to dynamically scale when connected to Event Hubs, the `username` property must resolve to an application setting that contains the actual username value. When the default `$ConnectionString` value is used, the Kafka trigger isn't able to cause the app to scale dynamically.
132132
+ For the built-in Container Apps [policy definitions](../container-apps/policy-reference.md#policy-definitions), currently only environment-level policies apply to Azure Functions containers.
133-
+ You can use managed identities for these connections:
134-
+ [Deployment from an Azure Container Registry](functions-deploy-container-apps.md?tabs=acr#create-and-configure-a-function-app-on-azure-with-the-image)
135-
+ [Triggers and bindings](functions-reference.md#configure-an-identity-based-connection)
136-
+ [Required host storage connection](functions-identity-based-connections-tutorial.md)
137133
+ By default, a containerized function app monitors port 80 for incoming requests. If your app must use a different port, use the [`WEBSITES_PORT` application setting](../app-service/reference-app-settings.md#custom-containers) to change this default port.
138134
+ You aren't currently able to use built-in continuous deployment features when hosting on Container Apps. You must instead deploy from source code using either [Azure Pipelines](functions-how-to-azure-devops.md?pivots=v1#deploy-a-container) or [GitHub Actions](https://github.com/Azure/azure-functions-on-container-apps/tree/main/samples/GitHubActions).
139135
+ You currently can't move a Container Apps hosted function app deployment between resource groups or between subscriptions. Instead, you would have to recreate the existing containerized app deployment in a new resource group, subscription, or region.

articles/databox/data-box-disk-deploy-picked-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ If needed, you can contact Quantium Solution Support (Japanese language) at the
190190
2. To request pickup, email SingPost Customer Service by using the following template with the tracking number (the tracking number can be found on the return label provided in the delivered package).
191191
192192
```
193-
To: g-corpsgcs@singpost.com
193+
To: g-keyacct@singpost.com
194194
Subject: Microsoft Azure Pickup - XZ00001234567
195195
Body:
196196
a. Requestor name

articles/databox/data-box-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Azure providers and non-Azure providers can ingest data from Azure Data Box. The
6767
You can use your Data Box data with many non-Azure service providers. For instance:
6868

6969
- **[Veeam](https://helpcenter.veeam.com/docs/backup/hyperv/osr_adding_data_box.html?ver=100)** - allows you to back up and replicate large amounts of data from your Hyper-V machine to your Data Box.
70-
70+
- **[Commvault](/azure/storage/solution-integration/validated-partners/backup-archive-disaster-recovery/commvault/commvault-solution-guide)** - leverages Azure Data Box to migrate petabyte scale backup and archive data from on-premises to Azure for network constrained environments.
7171
## Benefits
7272

7373
Data Box is designed to move large amounts of data to Azure with little to no impact to network. The solution has the following benefits:
@@ -110,6 +110,7 @@ The Data Box device has the following features in this release.
110110
| Security | Rugged device casing with tamper-proof custom screws <br> Intrusion detection system in device <br> Secure boot <br>Hardware Root of Trust <br> TPM 2.0  |
111111
| Data transfer rate | Approx. 7 GB/s using SMB Direct on RDMA (100-GbE) for large files. Both data ports can be used, though not required. Performance might differ depending on the source and size of your files.  |
112112
| Management | Local web UI - one-time initial setup and configuration <br> Azure portal - day-to-day device management |
113+
| Cooling capability | Fan cooled internally. <br> Operating temp is (0-35)C normal with full performance and (35-45)C with reduced performance <br> Storage temp is (-40 to 60)C <br> Airflow details are 144 CFM/KW for 120 TB and 122 CFM/KW for 525 TB |
113114

114115
[!INCLUDE [data-box-cable-adapter](../../includes/data-box-cable-adapter.md)]
115116

articles/deployment-environments/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ items:
122122
- name: Resources
123123
expanded: false
124124
items:
125-
- name: Azure roadmap
126-
href: https://azure.microsoft.com/roadmap/
125+
- name: Azure updates
126+
href: https://azure.microsoft.com/updates/?filters=%5B%22Azure+Deployment+Environments%22%5D
127127
- name: Regional availability
128128
href: https://azure.microsoft.com/regions/services/
129129
- name: Report a problem

0 commit comments

Comments
 (0)