Skip to content

Commit 716e433

Browse files
committed
Merge branch 'main' into release-preview-p2s
2 parents 05e75e9 + 85e8e22 commit 716e433

File tree

87 files changed

+965
-1119
lines changed

Some content is hidden

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

87 files changed

+965
-1119
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: "📄 Feedback control template"
2+
title: "Feedback"
3+
description: >-
4+
⛔ This template is intended for use by the feedback control on the bottom of every page on the
5+
live site. If you aren't using the feedback control, choose one of the other templates.⛔
6+
labels:
7+
- "needs-triage"
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: "## 🎁Enter your feedback🎁"
12+
- type: markdown
13+
attributes:
14+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
15+
- type: dropdown
16+
id: issue-type
17+
attributes:
18+
label: Type of issue
19+
options:
20+
- Typo
21+
- Code doesn't work
22+
- Missing information
23+
- Outdated article
24+
- Other (describe below)
25+
validations:
26+
required: true
27+
- type: textarea
28+
id: userfeedback
29+
validations:
30+
required: true
31+
attributes:
32+
label: Feedback
33+
description: >-
34+
If possible, please provide extended details that will add context and help the team update
35+
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
36+
For technical or factual errors, please include code snippets and output to show how the
37+
documentation is incorrect.
38+
- type: markdown
39+
attributes:
40+
value: "## 🚧 Article information 🚧"
41+
- type: markdown
42+
attributes:
43+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
44+
- type: input
45+
id: pageUrl
46+
validations:
47+
required: true
48+
attributes:
49+
label: Page URL
50+
- type: input
51+
id: contentSourceUrl
52+
validations:
53+
required: true
54+
attributes:
55+
label: Content source URL
56+
- type: input
57+
id: author
58+
validations:
59+
required: true
60+
attributes:
61+
label: Author
62+
description: GitHub Id of the author
63+
- type: input
64+
id: documentVersionIndependentId
65+
validations:
66+
required: true
67+
attributes:
68+
label: Document Id

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 47 additions & 42 deletions
Large diffs are not rendered by default.
7.46 KB
Loading
17.3 KB
Loading
8.9 KB
Loading
100 KB
Loading
32.8 KB
Loading

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,8 @@
883883
href: open-ai-secure-access-quickstart.md
884884
- name: Deploy an AI model with the AI toolchain operator
885885
href: ai-toolchain-operator.md
886+
- name: Deploy data and ML pipelines with Flyte
887+
href: use-flyte.md
886888
- name: DevOps
887889
items:
888890
- name: Azure DevOps Project

articles/aks/azure-linux-aks-partner-solutions.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ms.author: schaffererin
66
author: schaffererin
77
ms.topic: article
88
ms.custom: linux-related-content
9-
ms.date: 04/15/2024
9+
ms.date: 06/13/2024
1010
---
1111

1212
# Azure Linux AKS Container Host partner solutions
1313

1414
Microsoft collaborates with partners to ensure your build, test, deployment, configuration, and monitoring of your applications perform optimally with Azure Linux Container Host on AKS.
1515

16-
Our third party partners featured in this article have introduction guides to help you start using their solutions with your applications running on Azure Linux Container Host on AKS.
16+
The third party partners featured in this article have introduction guides to help you start using their solutions with your applications running on Azure Linux Container Host on AKS.
1717

1818
| Solutions | Partners |
1919
|--------------------|------------------------------------------------------------------------------------------------|
@@ -31,6 +31,8 @@ DevOps streamlines the delivery process, improves collaboration across teams, an
3131

3232
### Advantech
3333

34+
#### iFactoryEHS
35+
3436
:::image type="icon" source="./media/azure-linux-aks-partner-solutions/advantech.png":::
3537

3638
| Solution | Categories |
@@ -41,6 +43,24 @@ The right EHS management system can strengthen organizations behind the scenes a
4143

4244
For more information, see [Advantech & iFactoryEHS](https://page.advantech.com/en/global/solutions/ifactory/ifactory_ehs).
4345

46+
#### FactoryOEE
47+
48+
:::image type="icon" source="./media/azure-linux-aks-partner-solutions/factoryoee.png":::
49+
50+
| Solution | Categories |
51+
|----------|------------|
52+
| FactoryOEE | DevOps |
53+
54+
Advantech FactoryOEE is an innovative factory management tool that enhances production efficiency and focuses on energy consumption and carbon emissions.
55+
56+
<details> <summary> See more </summary><br>
57+
58+
Through advanced data analytics, it monitors energy usage in real-time, reducing carbon footprint. We're committed to creating an efficient, eco-friendly production model, optimizing your factory for peak performance while minimizing environmental impact. Choose FactoryOEE for the perfect balance of efficiency and sustainability.
59+
60+
</details>
61+
62+
For more information, see [Advantech & FactoryOEE solutions](https://wise-paas.advantech.com/marketplace/product/advantech.FactoryOEE) and [Advantech on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/advantech.ifactory_tpm?tab=Overview).
63+
4464
### Akuity
4565

4666
:::image type="icon" source="./media/azure-linux-aks-partner-solutions/akuity.png":::
-3.81 KB
Loading

0 commit comments

Comments
 (0)