Skip to content

Commit 1716267

Browse files
authored
Merge branch 'main' into 147653-v3-1-rest-api-update
2 parents 70b68af + e9af433 commit 1716267

File tree

86 files changed

+1434
-600
lines changed

Some content is hidden

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

86 files changed

+1434
-600
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
title: Microsoft Entra architecture icons
3+
description: Learn about the official collection of Microsoft Entra icons that you can use in architectural diagrams, training materials, or documentation.
4+
author: CelesteDG
5+
manager: CelesteDG
6+
ms.service: active-directory
7+
ms.subservice: fundamentals
8+
ms.topic: conceptual
9+
ms.date: 08/15/2023
10+
ms.author: celested
11+
ms.reviewer: nicholepet
12+
13+
# Customer intent: As a new or existing customer, I want to learn how I can use the official Microsoft Entra icons in architectural diagrams, training materials, or documentation.
14+
---
15+
16+
# Microsoft Entra architecture icons
17+
18+
Helping our customers design and architect new solutions is core to the Microsoft Entra mission. Architecture diagrams can help communicate design decisions and the relationships between components of a given workload. This article provides information about the official collection of Microsoft Entra icons that you can use in architectural diagrams, training materials, or documentation.
19+
20+
## General guidelines
21+
22+
### Do's
23+
24+
- Use the icon to illustrate how products can work together.
25+
- In diagrams, we recommend including the product name somewhere close to the icon.
26+
27+
### Don'ts
28+
29+
- Don't crop, flip, or rotate icons.
30+
- Don't distort or change the icon shape in any way.
31+
- Don't use Microsoft product icons to represent your product or service.
32+
- Don't use Microsoft product icons in marketing communications.
33+
34+
## Icon updates
35+
36+
| Month | Change description |
37+
|-------|--------------------|
38+
| August 2023 | Added a downloadable package that contains the Microsoft Entra architecture icons, branding playbook (which contains guidelines about the Microsoft Security visual identity), and terms of use. |
39+
40+
## Icon terms
41+
42+
Microsoft permits the use of these icons in architectural diagrams, training materials, or documentation. You may copy, distribute, and display the icons only for the permitted use unless granted explicit permission by Microsoft. Microsoft reserves all other rights.
43+
44+
<div id="consent-checkbox">
45+
I agree to the above terms.
46+
</div>
47+
48+
> [!div class="button"]
49+
> [Download icons](https://download.microsoft.com/download/a/4/2/a4289cad-4eaf-4580-87fd-ce999a601516/Microsoft-Entra-architecture-icons.zip?wt.mc_id=microsoftentraicons_downloadmicrosoftentraicons_content_cnl_csasci)
50+
51+
## More icon sets from Microsoft
52+
53+
- [Azure architecture icons](/azure/architecture/icons)
54+
- [Microsoft 365 architecture icons and templates](/microsoft-365/solutions/architecture-icons-templates)
55+
- [Dynamics 365 icons](/dynamics365/get-started/icons)
56+
- [Microsoft Power Platform icons](/power-platform/guidance/icons)

articles/active-directory/architecture/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ items:
77
items:
88
- name: Azure AD architecture
99
href: architecture.md
10+
- name: Microsoft Entra architecture icons
11+
href: architecture-icons.md
1012
- name: Road to the cloud
1113
items:
1214
- name: Introduction
2.01 KB
Loading
2.48 KB
Loading
1.85 KB
Loading

articles/active-directory/fundamentals/new-name.md

Lines changed: 152 additions & 53 deletions
Large diffs are not rendered by default.

articles/ai-services/document-intelligence/quickstarts/includes/v3-javascript-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: lajanuar
1212
---
1313
<!-- markdownlint-disable MD025 -->
1414

15-
[Client library](/javascript/api/overview/azure/ai-form-recognizer-readme?view=azure-node-latest&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/javascript/azure-ai-form-recognizer/5.0.0/index.html) | [API reference](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2023-07-31/operations/AnalyzeDocument) | [Package (npm)](https://www.npmjs.com/package/@azure/ai-form-recognizer/v/5.0.0) | [Samples](https://github.com/witemple-msft/azure-sdk-for-js/tree/ai-form-recognizer/5.0.0-release/sdk/formrecognizer/ai-form-recognizer/samples/v5) |[Supported REST API versions](../../sdk-overview-v3-1.md)
15+
[Client library](/javascript/api/overview/azure/ai-form-recognizer-readme?view=azure-node-latest&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/javascript/azure-ai-form-recognizer/5.0.0/index.html) | [API reference](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-2023-07-31/operations/AnalyzeDocument) | [Package (npm)](https://www.npmjs.com/package/@azure/ai-form-recognizer/v/5.0.0) | [Samples](https://github.com/witemple-msft/azure-sdk-for-js/tree/ai-form-recognizer/5.0.0-release/sdk/formrecognizer/ai-form-recognizer/samples/v5) |[Supported REST API versions](../../sdk-overview.md)
1616

1717
In this quickstart you'll, use the following features to analyze and extract data and values from forms and documents:
1818

articles/api-management/developer-portal-extend-custom-functionality.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,19 @@ The managed developer portal includes a **Custom HTML code** widget where you ca
4848
4949
## Create and upload custom widget
5050

51-
### Prerequisites
52-
51+
For more advanced widget use cases, API Management provides a scaffold and tools to help developers create a widget and upload it to the developer portal.
52+
53+
### Prerequisites
54+
5355
* Install [Node.JS runtime](https://nodejs.org/en/) locally
5456
* Basic knowledge of programming and web development
5557

5658
### Create widget
5759

60+
> [!WARNING]
61+
> Your custom widget code is stored in public Azure blob storage that's associated with your API Management instance. When you add a custom widget to the developer portal, code is read from this storage via an endpoint that doesn't require authentication, even if the developer portal or a page with the custom widget is only accessible to authenticated users. Don't include sensitive information or secrets in the custom widget code.
62+
>
63+
5864
1. In the administrative interface for the developer portal, select **Custom widgets** > **Create new custom widget**.
5965
1. Enter a widget name and choose a **Technology**. For more information, see [Widget templates](#widget-templates), later in this article.
6066
1. Select **Create widget**.
@@ -115,7 +121,6 @@ The managed developer portal includes a **Custom HTML code** widget where you ca
115121
116122
If prompted, sign in to your Azure account.
117123
118-
119124
The custom widget is now deployed to your developer portal. Using the portal's administrative interface, you can add it on pages in the developer portal and set values for any custom properties configured in the widget.
120125
121126
### Publish the developer portal
@@ -143,6 +148,7 @@ The React template contains prepared custom hooks in the `hooks.ts` file and est
143148
This [npm package](https://www.npmjs.com/package/@azure/api-management-custom-widgets-tools) contains the following functions to help you develop your custom widget and provides features including communication between the developer portal and your widget:
144149
145150
151+
146152
|Function |Description |
147153
|---------|---------|
148154
|[getValues](#azureapi-management-custom-widgets-toolsgetvalues) | Returns a JSON object containing values set in the widget editor combined with default values |
@@ -153,6 +159,7 @@ This [npm package](https://www.npmjs.com/package/@azure/api-management-custom-wi
153159
|[getWidgetData](#azureapi-management-custom-widgets-toolsgetwidgetdata) | Returns all data passed to your custom widget from the developer portal<br/><br/>Used internally in templates |
154160
155161
162+
156163
#### `@azure/api-management-custom-widgets-tools/getValues`
157164
158165
Function that returns a JSON object containing the values you've set in the widget editor combined with default values, passed as an argument.
@@ -192,6 +199,7 @@ This function returns a JavaScript promise, which after resolution returns a JSO
192199
> Manage and use the token carefully. Anyone who has it can access data in your API Management service.
193200
194201

202+
195203
#### `@azure/api-management-custom-widgets-tools/deployNodeJs`
196204

197205
This function deploys your widget to your blob storage. In all templates, it's preconfigured in the `deploy.js` file.
@@ -247,7 +255,6 @@ To implement your widget using another JavaScript UI framework and libraries, yo
247255
* For local development, the `config.msapim.json` file must be accessible at the URL `localhost:<port>/config.msapim.json` when the server is running.
248256

249257

250-
251258
## Next steps
252259

253260
Learn more about the developer portal:
@@ -256,3 +263,4 @@ Learn more about the developer portal:
256263
- [Frequently asked questions](developer-portal-faq.md)
257264
- [Scaffolder of a custom widget for developer portal of Azure API Management service](https://www.npmjs.com/package/@azure/api-management-custom-widgets-scaffolder)
258265
- [Tools for working with custom widgets of developer portal of Azure API Management service](https://www.npmjs.com/package/@azure/api-management-custom-widgets-tools)
266+

articles/app-service/app-service-key-vault-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: cephalin
66
ms.topic: article
77
ms.date: 07/31/2023
88
ms.author: mahender
9-
ms.custom: seodec18
9+
ms.custom: seodec18, AppServiceConnectivity
1010

1111
---
1212

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.assetid: 03c584f1-a93c-4e3d-ac1b-c82b50c75d3e
55
ms.devlang: csharp
66
ms.topic: tutorial
77
ms.date: 01/27/2022
8-
ms.custom: "devx-track-csharp, mvc, devcenter, vs-azure, seodec18"
8+
ms.custom: devx-track-csharp, mvc, devcenter, vs-azure, seodec18, AppServiceConnectivity
99
---
1010

1111
# Tutorial: Deploy an ASP.NET app to Azure with Azure SQL Database

0 commit comments

Comments
 (0)