Skip to content

Commit cda176a

Browse files
authored
Merge branch 'MicrosoftDocs:main' into docs-editor/network-requirements-1692319991
2 parents 8854542 + 9438fc3 commit cda176a

31 files changed

+292
-110
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/containers/install-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ monikerRange: '<=doc-intel-3.1.0'
2626
[!INCLUDE [applies to v2.1](../includes/applies-to-v2-1.md)]
2727
::: moniker-end
2828

29-
Azure AI Document Intelligence is an Azure AI service that lets you build automated data processing software using machine-learning technology. Document Intelligence enables you to identify and extract text, key/value pairs, selection marks, table data, and more from your form documents. The results are delivered as structured data that includes the relationships in the original file.
29+
Azure AI Document Intelligence is an Azure AI service that lets you build automated data processing software using machine-learning technology. Document Intelligence enables you to identify and extract text, key/value pairs, selection marks, table data, and more from your documents. The results are delivered as structured data that includes the relationships in the original file.
3030

3131
::: moniker range=">=doc-intel-3.0.0"
3232
In this article you learn how to download, install, and run Document Intelligence containers. Containers enable you to run the Document Intelligence service in your own environment. Containers are great for specific security and data governance requirements.

articles/ai-services/document-intelligence/create-sas-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ To get started, you need:
8181
:::image type="content" source="media/sas-tokens/upload-blob-window.png" alt-text="Screenshot that shows the Upload blob window in the Azure portal.":::
8282

8383
> [!NOTE]
84-
> By default, the REST API uses form documents located at the root of your container. You can also use data organized in subfolders if specified in the API call. For more information, see [Organize your data in subfolders](how-to-guides/build-a-custom-model.md?view=doc-intel-2.1.0&preserve-view=true#organize-your-data-in-subfolders-optional).
84+
> By default, the REST API uses documents located at the root of your container. You can also use data organized in subfolders if specified in the API call. For more information, see [Organize your data in subfolders](how-to-guides/build-a-custom-model.md?view=doc-intel-2.1.0&preserve-view=true#organize-your-data-in-subfolders-optional).
8585
8686
## Use the Azure portal
8787

articles/ai-services/document-intelligence/faq.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
ms.service: applied-ai-services
88
ms.subservice: forms-recognizer
99
ms.topic: faq
10-
ms.date: 08/02/2023
10+
ms.date: 08/17/2023
1111
ms.author: lajanuar
1212
monikerRange: '<=doc-intel-3.1.0'
1313

@@ -24,20 +24,28 @@ sections:
2424
What is Azure AI Document Intelligence and what happened to Form Recognizer?
2525
answer: |
2626
27-
- Form Recognizer is now Azure AI Document Intelligence!
28-
2927
- Azure AI Document Intelligence is a cloud-based Azure AI service that uses machine-learning models to extract key-value pairs, text, and tables from your documents. The returned result is a structured JSON output.
3028
3129
- Document Intelligence use cases include automated data processing, enhanced data-driven strategies, and enriched document search capabilities.
3230
33-
- As of July 2023, Azure AI services encompass all of what were previously known as Azure Cognitive Services and Azure Applied AI Services. There are no changes to pricing. The names "Cognitive Services" and "Azure Applied AI" continue to be used in Azure billing, cost analysis, price list, and price APIs. There are no breaking changes to application programming interfaces (APIs) or SDKs.
31+
- As of July 2023, Form Recognizer is now Azure AI Document Intelligence!
32+
33+
- Azure AI services encompass all of what were previously known as Azure Cognitive Services and Azure Applied AI Services.
34+
35+
- There are no changes to pricing. The names "Cognitive Services" and "Azure Applied AI" continue to be used in Azure billing, cost analysis, price list, and price APIs.
36+
37+
- There are no breaking changes to application programming interfaces (APIs) or SDKs.
38+
39+
- Some platforms are still awaiting the renaming update. All mention of Form Recognizer or Document Intelligence in our documentation refers to the same Azure service.
40+
41+
3442
3543
- question: |
3644
How is Document Intelligence related to Document Generative AI?
3745
answer: |
3846
3947
A Document Generative AI solution can enable you to chat with your documents, generate captivating content from them and access the power of Azure OpenAI models on your data. With Azure AI Document Intelligence and Azure OpenAI combined, you can build an enterprise application to seamlessly interact with your documents using natural languages, easily find answers and gain valuable insights, effortlessly generate new and engaging content from your existing documents. Check for more details in the [technical community blog](https://techcommunity.microsoft.com/t5/azure-ai-services-blog/document-generative-ai-the-power-of-azure-ai-document/ba-p/3875015).
40-
48+
4149
- question: |
4250
Which Document Intelligence use cases require special consideration?
4351
answer: |

articles/ai-services/document-intelligence/how-to-guides/build-a-custom-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Follow these tips to further optimize your data set for training.
175175

176176
## Upload your training data
177177

178-
When you've put together the set of form documents for training, you need to upload it to an Azure blob storage container. If you don't know how to create an Azure storage account with a container, follow the [Azure Storage quickstart for Azure portal](../../../storage/blobs/storage-quickstart-blobs-portal.md). Use the standard performance tier.
178+
When you've put together the set of documents for training, you need to upload it to an Azure blob storage container. If you don't know how to create an Azure storage account with a container, follow the [Azure Storage quickstart for Azure portal](../../../storage/blobs/storage-quickstart-blobs-portal.md). Use the standard performance tier.
179179

180180
If you want to use manually labeled data, upload the *.labels.json* and *.ocr.json* files that correspond to your training documents. You can use the [Sample Labeling tool](../label-tool.md) (or your own UI) to generate these files.
181181

0 commit comments

Comments
 (0)