Skip to content

Commit f43f60e

Browse files
authored
Merge branch 'mendix:development' into run/5208-update-offline-docs-for-java-update-tool
2 parents c325a34 + 2642961 commit f43f60e

94 files changed

Lines changed: 1522 additions & 909 deletions

File tree

Some content is hidden

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

assets/scss/_styles_project.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
margin-right:12px;
3232
}
3333

34-
.alert.has-line-breaks { // Reduce bottom padding of .alert when alert text has line breaks (class added in alerts.html)
35-
padding-bottom: 0px;
36-
}
37-
3834
// Anchor icon styling for anchor.js
3935

4036
.anchor-icon {

content/en/docs/apidocs-mxsdk/apidocs/deployment/backups-api-v2.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ A JSON object with the following attributes:
171171

172172
* `comment` (String): Optional comment for this snapshot.
173173

174-
**Example Request**
174+
{{% alert color="info" %}}
175+
The `comment` attribute is optional, but the API requires an empty JSON object (`{}`) to return a successful response.
176+
{{% /alert %}}
177+
178+
**Example Request 1**
175179

176180
```bash
177181
POST /api/v2/apps/543857rfds-dfsfsd12c5e24-3224d32eg/environments/cd5fc610-edb0-43c5-a374-0439a6411ace/snapshots
@@ -180,10 +184,19 @@ Host: deploy.mendix.com
180184
Content-Type: application/json
181185
Mendix-Username: richard.ford51@example.com
182186
Mendix-ApiKey: 26587896-1cef-4483-accf-ad304e2673d6
187+
{"comment": "My snapshot"}
188+
```
183189

184-
{
185-
"comment" : "My snapshot"
186-
}
190+
**Example Request 2**
191+
192+
```bash
193+
POST /api/v2/apps/543857rfds-dfsfsd12c5e24-3224d32eg/environments/cd5fc610-edb0-43c5-a374-0439a6411ace/snapshots
194+
Host: deploy.mendix.com
195+
196+
Content-Type: application/json
197+
Mendix-Username: richard.ford51@example.com
198+
Mendix-ApiKey: 26587896-1cef-4483-accf-ad304e2673d6
199+
{}
187200
```
188201

189202
#### Output

content/en/docs/apidocs-mxsdk/apidocs/governance/audit-logs-api.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@ no_list: false
77
description_list: true
88
description: "Provides the documentation for the Audit Logging API."
99
linktitle: "Audit Logs"
10-
beta: true
1110
---
1211

13-
{{% alert color="warning" %}}
14-
This feature is in Public Beta. For more information, refer to [Release Status](/releasenotes/release-status/).
15-
{{% /alert %}}
16-
1712
## Introduction
1813

1914
You can use the Audit Logging API to integrate with security information and event management tools.

content/en/docs/control-center/apps/apps-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Clicking an app name in a tab or the search results opens its details page, whic
6666
* **App Info** – Shows the **Description** and **App ID**, also found in your app's [Settings](/developerportal/general-settings/).
6767
* **Members** – Lists the team members in the app development team.
6868
* You can directly deactivate a team member from the app by clicking their name and selecting **Deactivate Member**.
69-
* For other member management options, click **Manage Members**, which will open the [Team](/developerportal/general/team/#managing) page of the app. As a Mendix Admin, you can also add yourself to a team via this page.
69+
* For other member management options, click **Manage Members**, which will open the [Team](/developerportal/general/team/#managing) page of the app.
7070
* **Environments** – Lists all Mendix Cloud environments. For the free Mendix Cloud environment, you can delete the environment on this tab. Once the free environment is deleted, all data will be removed. However, the app team members can still access the associated app repository in the Mendix Portal.
7171

7272
If the app is not a licensed app, you can see the action menu ({{% icon name="three-dots-menu-horizontal" %}}) on the upper-right corner of the page. If the app is active, then you have the options to deactivate the app and delete the app; and if the app is deactivated, then you have the options to activate the app and delete the app.

content/en/docs/control-center/entitlements/cloud-tokens.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
5151
| XXXXL21 | 1280 |
5252
| XXXXL-5XLDB | 2240 |
5353

54-
|Premium Resource Packs | Mendix Cloud Tokens |
54+
| Premium Resource Packs | Mendix Cloud Tokens |
5555
| --- | --- |
5656
| S21 | 30 |
5757
| M21 | 60 |
@@ -62,7 +62,7 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
6262
| XXXXL21 | 1920 |
6363
| XXXXL-5XLDB | 3360 |
6464

65-
|Premium Plus Resource Packs | Mendix Cloud Tokens |
65+
| Premium Plus Resource Packs | Mendix Cloud Tokens |
6666
| --- | --: |
6767
| XL21 | 400 |
6868
| XXL21 | 800 |
@@ -98,22 +98,10 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
9898

9999
## GenAI Resource Packs {#grps}
100100

101-
GenAI Resource Packs provide turn-key access to Generative AI technology, delivered through Mendix Cloud. For the technical details of each GenAI Resource Pack (GRP), refer to [GenAI Resource Packs](/agents/mx-cloud-genai/resource-packs/).
102-
103-
| GenAI Model Resource Pack – Anthropic Claude Sonnet | Mendix Cloud Tokens |
104-
| --- | --: |
105-
| S | 30 |
106-
| M | 60 |
107-
| L | 120 |
108-
109-
| GenAI Model Resource Pack – Cohere Embed | Mendix Cloud Tokens |
110-
| --- | --: |
111-
| S | 6 |
112-
| M | 12 |
113-
| L | 24 |
101+
GenAI Resource Packs provide turn-key access to Generative AI technology, delivered through Mendix Cloud. For text generation and embeddings resources, one Mendix Cloud Token equals 100 GenAI Units. You choose any Cloud Token amount when provisioning a resource. There are no fixed plan sizes. For technical details, GenAI Unit exchange rates, and model pricing, see [Mendix Cloud GenAI Resource Packs](/agents/mx-cloud-genai/resource-packs/).
114102

115103
| GenAI Knowledge Base Resource Packs | Mendix Cloud Tokens |
116-
| --- | --: |
104+
| --- | -- |
117105
| Standard | 48 |
118106

119107
## Key Takeaways

0 commit comments

Comments
 (0)