Skip to content

Commit 1c94c9b

Browse files
authored
Merge pull request #3562 from Blackmist/v1-synch
DIRTY PR
2 parents e831b6d + 3e45218 commit 1c94c9b

File tree

1,353 files changed

+13312
-32173
lines changed

Some content is hidden

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

1,353 files changed

+13312
-32173
lines changed

.github/policies/disallow-edits.yml

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,58 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
14-
- filesMatchPattern:
15-
matchAny: true
16-
pattern: articles/index.*
13+
- filesMatchPattern:
14+
matchAny: true
15+
pattern: articles/index.*
1716
then:
1817
- addReply:
1918
reply: >-
20-
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
19+
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
2120
- closePullRequest
21+
22+
- description: Close PRs to the "ai-services/personalizer" folder where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
23+
if:
24+
- payloadType: Pull_Request
25+
- isAction:
26+
action: Opened
27+
- filesMatchPattern:
28+
matchAny: true
29+
pattern: articles/ai-services/personalizer/*
30+
- not:
31+
activitySenderHasAssociation:
32+
association: Member
33+
then:
34+
- addReply:
35+
reply: >-
36+
@${issueAuthor} - Pull requests that modify files in this folder aren't accepted from public contributors.
37+
- closePullRequest
38+
39+
- description: \@mention specific people when a PR is opened in the "ai-services/personalizer" folder.
40+
if:
41+
- payloadType: Pull_Request
42+
- isAction:
43+
action: Opened
44+
- filesMatchPattern:
45+
matchAny: true
46+
pattern: articles/ai-services/personalizer/*
47+
- activitySenderHasAssociation:
48+
association: Member
49+
- not:
50+
or:
51+
- isActivitySender:
52+
user: eric-urban
53+
- isActivitySender:
54+
user: nitinme
55+
- isActivitySender:
56+
user: mrbullwinkle
57+
then:
58+
- addReply:
59+
reply: >-
60+
@${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
61+
- mentionUsers:
62+
mentionees:
63+
- eric-urban
64+
- nitinme
65+
- mrbullwinkle
66+
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
67+
assignMentionees: True # This part probably won't work since the bot doesn't have write perms.

articles/ai-foundry/.openpublishing.redirection.ai-studio.json

Lines changed: 1102 additions & 0 deletions
Large diffs are not rendered by default.

articles/ai-studio/ai-services/content-safety-overview.md renamed to articles/ai-foundry/ai-services/content-safety-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ Refer to the [Content Safety overview](/azure/ai-services/content-safety/overvie
4646

4747
## Next step
4848

49-
Get started using Azure AI Content Safety in [Azure AI Foundry portal](https://ai.azure.com) by following the [How-to guide](./how-to/content-safety.md).
49+
Get started using Azure AI Content Safety in [Azure AI Foundry portal](https://ai.azure.com) by following the [How-to guide](/azure/ai-services/content-safety/how-to/foundry).
File renamed without changes.

articles/ai-studio/ai-services/how-to/connect-azure-openai.md renamed to articles/ai-foundry/ai-services/how-to/connect-azure-openai.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Here are a few guides to help you get started with Azure OpenAI Service playgrou
100100
- [Quickstart: Use the chat playground](../../quickstarts/get-started-playground.md)
101101
- [Quickstart: Get started using Azure OpenAI Assistants](../../../ai-services/openai/assistants-quickstart.md?context=/azure/ai-studio/context/context)
102102
- [Quickstart: Use GPT-4o in the real-time audio playground](../../../ai-services/openai/realtime-audio-quickstart.md?context=/azure/ai-studio/context/context)
103-
- [Quickstart: Analyze images and video in the chat playground](../../quickstarts/multimodal-vision.md)
103+
- [Quickstart: Analyze images and video in the chat playground](/azure/ai-services/openai/gpt-v-quickstart)
104104

105105
Each playground has different model requirements and capabilities. The supported regions vary depending on the model. For more information about model availability per region, see the [Azure OpenAI Service models documentation](../../../ai-services/openai/concepts/models.md).
106106

@@ -145,5 +145,5 @@ At some point, you want to develop apps with code. Here are some developer resou
145145

146146
## Related content
147147

148-
- [Azure OpenAI in Azure AI Foundry portal](../../azure-openai-in-ai-studio.md)
148+
- [Azure OpenAI in Azure AI Foundry portal](../../azure-openai-in-ai-foundry.md)
149149
- [Use Azure AI services resources](./connect-ai-services.md)
File renamed without changes.
File renamed without changes.

articles/ai-studio/concepts/ai-resources.md renamed to articles/ai-foundry/concepts/ai-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ In the Azure portal, you can find resources that correspond to your project in A
128128

129129
## Next steps
130130

131-
- [Quickstart: Analyze images and video in the chat playground](../quickstarts/multimodal-vision.md)
132-
- [Learn more about Azure AI Foundry](../what-is-ai-studio.md)
131+
- [Quickstart: Analyze images and video in the chat playground](/azure/ai-services/openai/gpt-v-quickstart)
132+
- [Learn more about Azure AI Foundry](../what-is-ai-foundry.md)
133133
- [Learn more about projects](../how-to/create-projects.md)

articles/ai-studio/concepts/architecture.md renamed to articles/ai-foundry/concepts/architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ At the top level, Azure AI Foundry provides access to the following resources:
2828

2929
When you use Azure AI Foundry portal, you can directly work with Azure OpenAI without an Azure Studio project. Or you can use Azure OpenAI through a project.
3030

31-
For more information, visit [Azure OpenAI in Azure AI Foundry portal](../azure-openai-in-ai-studio.md).
31+
For more information, visit [Azure OpenAI in Azure AI Foundry portal](../azure-openai-in-ai-foundry.md).
3232

3333
- **Management center**: The management center streamlines governance and management of Azure AI Foundry resources such as hubs, projects, connected resources, and deployments.
3434

@@ -108,7 +108,7 @@ Azure AI services including Azure OpenAI provide control plane endpoints for ope
108108

109109
To reduce the complexity of Azure RBAC management, Azure AI Foundry provides a *control plane proxy* that allows you to perform operations on connected Azure AI services and Azure OpenAI resources. Performing operations on these resources through the control plane proxy only requires Azure RBAC permissions on the hub. The Azure AI Foundry service then performs the call to the Azure AI services or Azure OpenAI control plane endpoint on your behalf.
110110

111-
For more information, see [Role-based access control in Azure AI Foundry portal](rbac-ai-studio.md).
111+
For more information, see [Role-based access control in Azure AI Foundry portal](rbac-ai-foundry.md).
112112

113113
## Attribute-based access control
114114

0 commit comments

Comments
 (0)